diff -r 6c772398eb4e -r 42b3ac0a5b05 tests/test-evolve-phase.t --- a/tests/test-evolve-phase.t Sat Jan 20 12:28:32 2018 +0100 +++ b/tests/test-evolve-phase.t Sat Jan 20 12:38:09 2018 +0100 @@ -32,15 +32,15 @@ [1] b $ echo b2>b $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg evolve move:[2] c - atop:[3] b + atop:[4] b working directory is now at 813dde83a7f3 $ hg glog - @ 4 - 813dde83a7f3 c (secret) + @ 5 - 813dde83a7f3 c (secret) | - o 3 - fd89d0f19529 b (draft) + o 4 - fd89d0f19529 b (draft) | o 0 - cb9a9f314b8b a (draft) @@ -70,10 +70,10 @@ [1] b $ echo b2 > a $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg glog - @ 3 - 87495ea7c9ec b (draft) + @ 4 - 87495ea7c9ec b (draft) | | o 2 - 13833940840c c (secret) | | @@ -83,7 +83,7 @@ $ hg evolve move:[2] c - atop:[3] b + atop:[4] b merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! @@ -103,7 +103,7 @@ +>>>>>>> evolving: 13833940840c - test: c $ hg glog - @ 3 - 87495ea7c9ec b (draft) + @ 4 - 87495ea7c9ec b (draft) | | o 2 - 13833940840c c (secret) | | @@ -119,9 +119,9 @@ evolving 2:13833940840c "c" $ hg glog - @ 4 - 3d2080c198e5 c (secret) + @ 5 - 3d2080c198e5 c (secret) | - o 3 - 87495ea7c9ec b (draft) + o 4 - 87495ea7c9ec b (draft) | o 0 - cb9a9f314b8b a (draft)