tests/test-evolve-obshistory.t
branchmercurial-4.1
changeset 2431 0405bbda7402
parent 2423 677dfbb8bdbf
parent 2420 94d1c7a1905a
child 2432 765b2561fa90
child 2531 d3d686f05458
equal deleted inserted replaced
2430:d4ee0274a8ef 2431:0405bbda7402
    10   > interactive = true
    10   > interactive = true
    11   > [phases]
    11   > [phases]
    12   > publish=False
    12   > publish=False
    13   > [extensions]
    13   > [extensions]
    14   > evolve =
    14   > evolve =
       
    15   > color =
    15   > EOF
    16   > EOF
    16 
    17 
    17 Test output on amended commit
    18 Test output on amended commit
    18 =============================
    19 =============================
    19 
    20 
   111           "debugobshistory.shortdescription": "A0"
   112           "debugobshistory.shortdescription": "A0"
   112       }
   113       }
   113   ]
   114   ]
   114   $ hg update 471f378eab4c
   115   $ hg update 471f378eab4c
   115   abort: hidden revision '471f378eab4c'!
   116   abort: hidden revision '471f378eab4c'!
   116   (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   117   (use --hidden to access hidden revisions)
   117   [255]
   118   [255]
   118   $ hg update --hidden "desc(A0)"
   119   $ hg update --hidden "desc(A0)"
   119   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   120   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   120   working directory parent is obsolete! (471f378eab4c)
   121   working directory parent is obsolete! (471f378eab4c)
   121   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   122   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   209   ]
   210   ]
   210   $ hg up 1
   211   $ hg up 1
   211   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   212   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   212   $ hg up 0dec01379d3b
   213   $ hg up 0dec01379d3b
   213   abort: hidden revision '0dec01379d3b'!
   214   abort: hidden revision '0dec01379d3b'!
   214   (use --hidden to access hidden revisions; pruned)
   215   (use --hidden to access hidden revisions)
   215   [255]
   216   [255]
   216   $ hg up --hidden -r 'desc(B0)'
   217   $ hg up --hidden -r 'desc(B0)'
   217   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   218   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   218   working directory parent is obsolete! (0dec01379d3b)
   219   working directory parent is obsolete! (0dec01379d3b)
   219   (use 'hg evolve' to update to its parent successor)
   220   (use 'hg evolve' to update to its parent successor)
   358   x  471597cad322 (1) A0
   359   x  471597cad322 (1) A0
   359        rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob)
   360        rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob)
   360   
   361   
   361   $ hg update 471597cad322
   362   $ hg update 471597cad322
   362   abort: hidden revision '471597cad322'!
   363   abort: hidden revision '471597cad322'!
   363   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   364   (use --hidden to access hidden revisions)
   364   [255]
   365   [255]
   365   $ hg update --hidden 'min(desc(A0))'
   366   $ hg update --hidden 'min(desc(A0))'
   366   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   367   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   367   working directory parent is obsolete! (471597cad322)
   368   working directory parent is obsolete! (471597cad322)
   368   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   369   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   597   x  de7290d8b885 (1) A0
   598   x  de7290d8b885 (1) A0
   598        rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
   599        rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
   599   
   600   
   600   $ hg update de7290d8b885
   601   $ hg update de7290d8b885
   601   abort: hidden revision 'de7290d8b885'!
   602   abort: hidden revision 'de7290d8b885'!
   602   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   603   (use --hidden to access hidden revisions)
   603   [255]
   604   [255]
   604   $ hg update --hidden 'min(desc(A0))'
   605   $ hg update --hidden 'min(desc(A0))'
   605   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   606   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   606   working directory parent is obsolete! (de7290d8b885)
   607   working directory parent is obsolete! (de7290d8b885)
   607   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   608   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   731           "debugobshistory.shortdescription": "B0"
   732           "debugobshistory.shortdescription": "B0"
   732       }
   733       }
   733   ]
   734   ]
   734   $ hg update 471f378eab4c
   735   $ hg update 471f378eab4c
   735   abort: hidden revision '471f378eab4c'!
   736   abort: hidden revision '471f378eab4c'!
   736   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   737   (use --hidden to access hidden revisions)
   737   [255]
   738   [255]
   738   $ hg update --hidden 'desc(A0)'
   739   $ hg update --hidden 'desc(A0)'
   739   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   740   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   740   working directory parent is obsolete! (471f378eab4c)
   741   working directory parent is obsolete! (471f378eab4c)
   741   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   742   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   742   $ hg update 0dec01379d3b
   743   $ hg update 0dec01379d3b
   743   working directory parent is obsolete! (471f378eab4c)
   744   working directory parent is obsolete! (471f378eab4c)
   744   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   745   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   745   abort: hidden revision '0dec01379d3b'!
   746   abort: hidden revision '0dec01379d3b'!
   746   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   747   (use --hidden to access hidden revisions)
   747   [255]
   748   [255]
   748   $ hg update --hidden 'desc(B0)'
   749   $ hg update --hidden 'desc(B0)'
   749   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   750   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   750   working directory parent is obsolete! (0dec01379d3b)
   751   working directory parent is obsolete! (0dec01379d3b)
   751   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   752   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   925           "debugobshistory.shortdescription": "A1"
   926           "debugobshistory.shortdescription": "A1"
   926       }
   927       }
   927   ]
   928   ]
   928   $ hg update 471f378eab4c
   929   $ hg update 471f378eab4c
   929   abort: hidden revision '471f378eab4c'!
   930   abort: hidden revision '471f378eab4c'!
   930   (use --hidden to access hidden revisions; diverged)
   931   (use --hidden to access hidden revisions)
   931   [255]
   932   [255]
   932   $ hg update --hidden 'desc(A0)'
   933   $ hg update --hidden 'desc(A0)'
   933   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   934   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   934   working directory parent is obsolete! (471f378eab4c)
   935   working directory parent is obsolete! (471f378eab4c)
   935   (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
   936   (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
  1080           "debugobshistory.shortdescription": "A0"
  1081           "debugobshistory.shortdescription": "A0"
  1081       }
  1082       }
  1082   ]
  1083   ]
  1083   $ hg update 471f378eab4c
  1084   $ hg update 471f378eab4c
  1084   abort: hidden revision '471f378eab4c'!
  1085   abort: hidden revision '471f378eab4c'!
  1085   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1086   (use --hidden to access hidden revisions)
  1086   [255]
  1087   [255]
  1087   $ hg update --hidden 'desc(A0)'
  1088   $ hg update --hidden 'desc(A0)'
  1088   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1089   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1089   working directory parent is obsolete! (471f378eab4c)
  1090   working directory parent is obsolete! (471f378eab4c)
  1090   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1091   (use 'hg evolve' to update to its successor: eb5a0daa2192)