--- a/tests/test-evolve-content-divergent-stack.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-stack.t	Tue Apr 23 12:28:32 2019 +0200
@@ -260,7 +260,6 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo wat > a
   $ hg amend -m "watbar to a"
-  3 new orphan changesets
   $ hg evolve --all
   move:[2] added b
   atop:[5] watbar to a
@@ -288,28 +287,27 @@
   adding file changes
   added 5 changesets with 1 changes to 5 files (+1 heads)
   4 new obsolescence markers
-  8 new content-divergent changesets
   new changesets 2228e3b74514:d45f050514c2
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
-  *  13:d45f050514c2 added d
+  o  13:d45f050514c2 added d
   |   () [default] draft
-  *  12:8ed612937375 added c
+  o  12:8ed612937375 added c
   |   () [default] draft
-  *  11:6eb54b5af3fb added b
+  o  11:6eb54b5af3fb added b
   |   () [default] draft
-  *  10:c04ff147ef79 added a
+  o  10:c04ff147ef79 added a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
   | @  8:c72d2885eb51 added d
   | |   () [default] draft
-  | *  7:3ce4be6d8e5e added c
+  | o  7:3ce4be6d8e5e added c
   | |   () [default] draft
-  | *  6:d5f148423c16 added b
+  | o  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | o  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -322,7 +320,6 @@
   updating to "local" side of the conflict: c04ff147ef79
   merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[11] added b
   with: [6] added b
   base: [2] added b