diff tests/test-evolve-phase.t @ 3936:537fd9a86c06 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

--- a/tests/test-evolve-phase.t	Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-evolve-phase.t	Fri Aug 03 00:22:50 2018 +0200
@@ -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')
   fix conflicts and see `hg help evolve.interrupted`
@@ -101,7 +101,7 @@
   +>>>>>>> evolving:    13833940840c - test: c
 
   $ hg glog
-  @  3 - 87495ea7c9ec b (draft)
+  @  4 - 87495ea7c9ec b (draft)
   |
   | o  2 - 13833940840c c (secret)
   | |
@@ -119,9 +119,9 @@
   working directory is now at 3d2080c198e5
 
   $ 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)