--- a/tests/test-issue-5720.t Mon Apr 23 12:11:10 2018 +0200
+++ b/tests/test-issue-5720.t Mon Apr 23 12:23:00 2018 +0200
@@ -45,9 +45,9 @@
[1] b
$ echo b2 > a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G -T "{rev}: {phase}"
- @ 3: draft
+ @ 4: draft
|
| o 2: secret
| |
@@ -58,7 +58,7 @@
Evolve which triggers a conflict
$ 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!
@@ -79,9 +79,9 @@
Tip should stay in secret phase
$ hg log -G -T "{rev}: {phase}"
- @ 4: secret
+ @ 5: secret
|
- o 3: draft
+ o 4: draft
|
o 0: draft