tests/test-evolve-obshistory.t
changeset 2290 a36a8c6a09ac
parent 2289 61d073590fb7
child 2317 7263463ae79a
child 2336 93a37e13424f
equal deleted inserted replaced
2289:61d073590fb7 2290:a36a8c6a09ac
    50      summary:     ROOT
    50      summary:     ROOT
    51   
    51   
    52 Actual test
    52 Actual test
    53 -----------
    53 -----------
    54 
    54 
       
    55   $ hg update 471f378eab4c
       
    56   abort: hidden revision '471f378eab4c'!
       
    57   (use --hidden to access hidden revisions; successor: a468dc9b3633)
       
    58   [255]
    55   $ hg update --hidden "desc(A0)"
    59   $ hg update --hidden "desc(A0)"
    56   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
    57   working directory parent is obsolete! (471f378eab4c)
    61   working directory parent is obsolete! (471f378eab4c)
    58   (use 'hg evolve' to update to its successor: a468dc9b3633)
    62   (use 'hg evolve' to update to its successor: a468dc9b3633)
    59 
    63 
    91   1 changesets pruned
    95   1 changesets pruned
    92 
    96 
    93 Actual test
    97 Actual test
    94 -----------
    98 -----------
    95 
    99 
       
   100   $ hg up 1
       
   101   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   102   $ hg up 0dec01379d3b
       
   103   abort: hidden revision '0dec01379d3b'!
       
   104   (use --hidden to access hidden revisions; pruned)
       
   105   [255]
    96   $ hg up --hidden -r 'desc(B0)'
   106   $ hg up --hidden -r 'desc(B0)'
    97   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
    98   working directory parent is obsolete! (0dec01379d3b)
   108   working directory parent is obsolete! (0dec01379d3b)
    99   (use 'hg evolve' to update to its parent successor)
   109   (use 'hg evolve' to update to its parent successor)
   100 
   110 
   183      summary:     ROOT
   193      summary:     ROOT
   184   
   194   
   185 Actual test
   195 Actual test
   186 -----------
   196 -----------
   187 
   197 
       
   198   $ hg update 471597cad322
       
   199   abort: hidden revision '471597cad322'!
       
   200   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
       
   201   [255]
   188   $ hg update --hidden 'min(desc(A0))'
   202   $ hg update --hidden 'min(desc(A0))'
   189   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
   190   working directory parent is obsolete! (471597cad322)
   204   working directory parent is obsolete! (471597cad322)
   191   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   205   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   192 
   206 
   341      summary:     ROOT
   355      summary:     ROOT
   342   
   356   
   343 Actual test
   357 Actual test
   344 -----------
   358 -----------
   345 
   359 
       
   360   $ hg update de7290d8b885
       
   361   abort: hidden revision 'de7290d8b885'!
       
   362   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
       
   363   [255]
   346   $ hg update --hidden 'min(desc(A0))'
   364   $ hg update --hidden 'min(desc(A0))'
   347   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
   348   working directory parent is obsolete! (de7290d8b885)
   366   working directory parent is obsolete! (de7290d8b885)
   349   (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)
   350 
   368 
   403      summary:     ROOT
   421      summary:     ROOT
   404   
   422   
   405  Actual test
   423  Actual test
   406  -----------
   424  -----------
   407 
   425 
       
   426   $ hg update 471f378eab4c
       
   427   abort: hidden revision '471f378eab4c'!
       
   428   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
       
   429   [255]
   408   $ hg update --hidden 'desc(A0)'
   430   $ hg update --hidden 'desc(A0)'
   409   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
   410   working directory parent is obsolete! (471f378eab4c)
   432   working directory parent is obsolete! (471f378eab4c)
   411   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   433   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
   434   $ hg update 0dec01379d3b
       
   435   working directory parent is obsolete! (471f378eab4c)
       
   436   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
   437   abort: hidden revision '0dec01379d3b'!
       
   438   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
       
   439   [255]
   412   $ hg update --hidden 'desc(B0)'
   440   $ hg update --hidden 'desc(B0)'
   413   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
   414   working directory parent is obsolete! (0dec01379d3b)
   442   working directory parent is obsolete! (0dec01379d3b)
   415   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   443   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   416 
   444 
   476      summary:     ROOT
   504      summary:     ROOT
   477   
   505   
   478 Actual test
   506 Actual test
   479 -----------
   507 -----------
   480 
   508 
       
   509   $ hg update 471f378eab4c
       
   510   abort: hidden revision '471f378eab4c'!
       
   511   (use --hidden to access hidden revisions; diverged)
       
   512   [255]
   481   $ hg update --hidden 'desc(A0)'
   513   $ hg update --hidden 'desc(A0)'
   482   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
   483   working directory parent is obsolete! (471f378eab4c)
   515   working directory parent is obsolete! (471f378eab4c)
   484   (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)