tests/test-amend.t
changeset 47552 93ca7d3278b9
parent 47381 8125bcd28a5c
child 47553 debc29900b97
equal deleted inserted replaced
47551:b7a706e7843a 47552:93ca7d3278b9
   248       set experimental.evolution.allowdivergence=True to skip this check
   248       set experimental.evolution.allowdivergence=True to skip this check
   249   (see 'hg help evolution.instability' for details on content-divergence)
   249   (see 'hg help evolution.instability' for details on content-divergence)
   250   [10]
   250   [10]
   251   $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
   251   $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
   252   2 new content-divergent changesets
   252   2 new content-divergent changesets
       
   253 
       
   254 Hidden common predecessor of divergence does not cause crash
       
   255 
       
   256 First create C1 as a pruned successor of C
       
   257   $ hg co C
       
   258   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   259   $ hg amend -m C1
       
   260   $ hg tag --local C1
       
   261   $ hg debugobsolete $(hg log -T '{node}' -r C1)
       
   262   1 new obsolescence markers
       
   263   obsoleted 1 changesets
       
   264 Now create C2 as other side of divergence (not actually divergent because C1 is
       
   265 pruned)
       
   266   $ hg co C
       
   267   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   268   $ hg amend -m C2
       
   269   1 new orphan changesets
       
   270 Make the common predecessor (C) pruned
       
   271   $ hg tag --local --remove C
       
   272   $ hg co C1
       
   273   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   274 Try to cause divergence
       
   275   $ hg amend -m C11
       
   276   abort: filtered revision '26805aba1e600a82e93661149f2313866a221a7b' (known-bad-output !)
       
   277   [255]
       
   278  [10]
   253 #endif
   279 #endif
   254 
   280 
   255 Cannot amend public changeset
   281 Cannot amend public changeset
   256 
   282 
   257   $ hg phase -r A --public
   283   $ hg phase -r A --public