tests/test-pick.t
branchstable
changeset 4891 a9929dd36405
parent 4800 fa534a8c5863
child 4915 5113b38cb677
equal deleted inserted replaced
4890:a8fa397795c1 4891:a9929dd36405
   170   |
   170   |
   171   o  3:8e224524cd09 add x
   171   o  3:8e224524cd09 add x
   172   |
   172   |
   173   o  0:1f0dee641bb7 add a
   173   o  0:1f0dee641bb7 add a
   174   
   174   
       
   175 
       
   176 there were no changes to commit, so there shouldn't be any predecessors of 6,
       
   177 and 2 should say it was pruned (issue6093)
       
   178 
       
   179   $ hg olog --all --hidden -r 2+6
       
   180   x  4538525df7e2 (2) add c
       
   181        pruned using pick by test (Thu Jan 01 00:00:00 1970 +0000)
       
   182   
       
   183   @  c4636a81ebeb (6) add c
       
   184   
       
   185 
   175 interrupted pick
   186 interrupted pick
   176 
   187 
   177   $ hg up d46dc301d92f
   188   $ hg up d46dc301d92f
   178   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   189   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   179   $ echo foo > c
   190   $ echo foo > c