tests/test-evolve-continue.t
changeset 5010 effce0a1f5bd
parent 4676 b6c819facbe8
child 5011 04104042c6ad
equal deleted inserted replaced
5009:0ab3b94562ab 5010:effce0a1f5bd
   432 
   432 
   433   $ hg st -C
   433   $ hg st -C
   434   M c
   434   M c
   435   A d
   435   A d
   436   ? c.orig
   436   ? c.orig
       
   437 
       
   438   $ cd ..
       
   439   $ hg init transitive-renames
       
   440   $ cd transitive-renames
       
   441   $ echo 1 > a
       
   442   $ echo 1 > b
       
   443   $ hg ci -Aqm initial
       
   444   $ echo 2 > a
       
   445   $ hg mv b c
       
   446   $ hg ci -m 'rename b to c'
       
   447   $ echo 3 > a
       
   448   $ hg mv c d
       
   449   $ hg ci -m 'rename c to d'
       
   450   $ hg prev -q
       
   451   $ echo 2b > a
       
   452   $ hg amend -q
       
   453   1 new orphan changesets
       
   454   $ hg ev -q
       
   455   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
       
   456   unresolved merge conflicts
       
   457   (see 'hg help evolve.interrupted')
       
   458   [1]
       
   459 BROKEN: 'd' should be marked as a copy
       
   460   $ hg st -C
       
   461   M a
       
   462   A d
       
   463   R c
       
   464   ? a.orig