tests/test-evolve-obshistory.t
branchmercurial-4.1
changeset 2317 7263463ae79a
parent 2290 a36a8c6a09ac
child 2318 523855eb28c1
child 2423 677dfbb8bdbf
equal deleted inserted replaced
2316:35a548465647 2317:7263463ae79a
    52 Actual test
    52 Actual test
    53 -----------
    53 -----------
    54 
    54 
    55   $ hg update 471f378eab4c
    55   $ hg update 471f378eab4c
    56   abort: hidden revision '471f378eab4c'!
    56   abort: hidden revision '471f378eab4c'!
    57   (use --hidden to access hidden revisions; successor: a468dc9b3633)
    57   (use --hidden to access hidden revisions)
    58   [255]
    58   [255]
    59   $ hg update --hidden "desc(A0)"
    59   $ hg update --hidden "desc(A0)"
    60   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    60   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    61   working directory parent is obsolete! (471f378eab4c)
    61   working directory parent is obsolete! (471f378eab4c)
    62   (use 'hg evolve' to update to its successor: a468dc9b3633)
    62   (use 'hg evolve' to update to its successor: a468dc9b3633)
    99 
    99 
   100   $ hg up 1
   100   $ hg up 1
   101   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   101   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   102   $ hg up 0dec01379d3b
   102   $ hg up 0dec01379d3b
   103   abort: hidden revision '0dec01379d3b'!
   103   abort: hidden revision '0dec01379d3b'!
   104   (use --hidden to access hidden revisions; pruned)
   104   (use --hidden to access hidden revisions)
   105   [255]
   105   [255]
   106   $ hg up --hidden -r 'desc(B0)'
   106   $ hg up --hidden -r 'desc(B0)'
   107   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   107   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   108   working directory parent is obsolete! (0dec01379d3b)
   108   working directory parent is obsolete! (0dec01379d3b)
   109   (use 'hg evolve' to update to its parent successor)
   109   (use 'hg evolve' to update to its parent successor)
   195 Actual test
   195 Actual test
   196 -----------
   196 -----------
   197 
   197 
   198   $ hg update 471597cad322
   198   $ hg update 471597cad322
   199   abort: hidden revision '471597cad322'!
   199   abort: hidden revision '471597cad322'!
   200   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   200   (use --hidden to access hidden revisions)
   201   [255]
   201   [255]
   202   $ hg update --hidden 'min(desc(A0))'
   202   $ hg update --hidden 'min(desc(A0))'
   203   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   203   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   204   working directory parent is obsolete! (471597cad322)
   204   working directory parent is obsolete! (471597cad322)
   205   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   205   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   357 Actual test
   357 Actual test
   358 -----------
   358 -----------
   359 
   359 
   360   $ hg update de7290d8b885
   360   $ hg update de7290d8b885
   361   abort: hidden revision 'de7290d8b885'!
   361   abort: hidden revision 'de7290d8b885'!
   362   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   362   (use --hidden to access hidden revisions)
   363   [255]
   363   [255]
   364   $ hg update --hidden 'min(desc(A0))'
   364   $ hg update --hidden 'min(desc(A0))'
   365   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   365   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   366   working directory parent is obsolete! (de7290d8b885)
   366   working directory parent is obsolete! (de7290d8b885)
   367   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   367   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   423  Actual test
   423  Actual test
   424  -----------
   424  -----------
   425 
   425 
   426   $ hg update 471f378eab4c
   426   $ hg update 471f378eab4c
   427   abort: hidden revision '471f378eab4c'!
   427   abort: hidden revision '471f378eab4c'!
   428   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   428   (use --hidden to access hidden revisions)
   429   [255]
   429   [255]
   430   $ hg update --hidden 'desc(A0)'
   430   $ hg update --hidden 'desc(A0)'
   431   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   431   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   432   working directory parent is obsolete! (471f378eab4c)
   432   working directory parent is obsolete! (471f378eab4c)
   433   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   433   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   434   $ hg update 0dec01379d3b
   434   $ hg update 0dec01379d3b
   435   working directory parent is obsolete! (471f378eab4c)
   435   working directory parent is obsolete! (471f378eab4c)
   436   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   436   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   437   abort: hidden revision '0dec01379d3b'!
   437   abort: hidden revision '0dec01379d3b'!
   438   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   438   (use --hidden to access hidden revisions)
   439   [255]
   439   [255]
   440   $ hg update --hidden 'desc(B0)'
   440   $ hg update --hidden 'desc(B0)'
   441   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   441   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   442   working directory parent is obsolete! (0dec01379d3b)
   442   working directory parent is obsolete! (0dec01379d3b)
   443   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   443   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   506 Actual test
   506 Actual test
   507 -----------
   507 -----------
   508 
   508 
   509   $ hg update 471f378eab4c
   509   $ hg update 471f378eab4c
   510   abort: hidden revision '471f378eab4c'!
   510   abort: hidden revision '471f378eab4c'!
   511   (use --hidden to access hidden revisions; diverged)
   511   (use --hidden to access hidden revisions)
   512   [255]
   512   [255]
   513   $ hg update --hidden 'desc(A0)'
   513   $ hg update --hidden 'desc(A0)'
   514   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   514   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   515   working directory parent is obsolete! (471f378eab4c)
   515   working directory parent is obsolete! (471f378eab4c)
   516   (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
   516   (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)