diff tests/test-evolve-orphan-merge.t @ 4363:a2fdbece7ce1 mercurial-4.4

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

--- a/tests/test-evolve-orphan-merge.t	Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-evolve-orphan-merge.t	Tue Jan 22 12:57:25 2019 -0500
@@ -51,12 +51,11 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  4:64370c9805e7 added b
   |   () draft
-  | *    3:3b2b6f4652ee merging a and b
+  | o    3:3b2b6f4652ee merging a and b
   | |\    () draft
   +---x  2:d76850646258 added b
   | |     () draft
@@ -96,12 +95,11 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > a
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  6:3d41537b44ca added a
   |   () draft
-  | *    5:91fd62122a4b merging a and b
+  | o    5:91fd62122a4b merging a and b
   | |\    () draft
   +---o  4:64370c9805e7 added b
   | |     () draft
@@ -177,7 +175,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ echo foobar > c
   $ hg resolve -m
@@ -200,12 +198,11 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo FOO > c
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  11:31c317b7bdb1 foo to c
   |   () draft
-  | *    10:fd41d25a3e90 foobar to c
+  | o    10:fd41d25a3e90 foobar to c
   | |\    () draft
   +---o  9:d0f84b25d4e3 bar to c
   | |     () draft
@@ -255,12 +252,11 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > c
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  13:928097d0b5b5 foo to c
   |   () draft
-  | *    12:c5405d2da7a1 foobar to c
+  | o    12:c5405d2da7a1 foobar to c
   | |\    () draft
   +---x  11:31c317b7bdb1 foo to c
   | |     () draft
@@ -329,18 +325,17 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo bar > l
   $ hg amend
-  2 new orphan changesets
 
   $ hg glog
   @  20:fccc9de66799 added l
   |   () draft
-  | *    19:190763373d8b merge commit
+  | o    19:190763373d8b merge commit
   | |\    () draft
   | | o  18:863d11043c67 added y
   | | |   () draft
   +---o  17:3f2247835c1d added x
   | |     () draft
-  | *  16:e44dc179e7f5 added m
+  | o  16:e44dc179e7f5 added m
   | |   () draft
   | x  15:8634bee7bf1e added l
   |/    () draft
@@ -391,7 +386,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo foobar > l
   $ hg amend
-  1 new orphan changesets
   $ hg up 3f2247835c1d
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > x
@@ -401,7 +395,7 @@
   |   () draft
   | o  24:3f371171d767 added l
   |/    () draft
-  | *    23:7b78a9784f3e merged l and x
+  | o    23:7b78a9784f3e merged l and x
   | |\    () draft
   +---x  20:fccc9de66799 added l
   | |     () draft
@@ -459,7 +453,6 @@
 
   $ hg prune -r cdf6547da25f
   1 changesets pruned
-  1 new orphan changesets
   $ hg glog
   @    27:adb665a78e08 merged l and x
   |\    () draft
@@ -497,7 +490,6 @@
 
   $ hg prune -r 3f371171d767
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @    28:fb8fe870ae7d merged l and x
@@ -567,7 +559,6 @@
 
   $ hg prune -r f3ba8b99bb6f
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @    31:32beb84b9dbc merge commit