--- a/tests/test-evolve-content-divergent-stack.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-content-divergent-stack.t	Wed Jun 05 17:56:44 2019 +0200
@@ -64,7 +64,6 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar > a
   $ hg amend -m "watbar to a"
-  3 new orphan changesets
   $ echo wat > a
   $ hg amend -m "watbar to a"
   $ hg evolve --all
@@ -89,7 +88,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
@@ -115,26 +113,25 @@
   adding file changes
   added 4 changesets with 0 changes to 4 files (+1 heads)
   5 new obsolescence markers
-  8 new content-divergent changesets
   new changesets 82b74d5dc678:15c781f93cac
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
-  *  12:15c781f93cac added d
+  o  12:15c781f93cac added d
   |   () [default] draft
-  *  11:9e5fb1d5b955 added c
+  o  11:9e5fb1d5b955 added c
   |   () [default] draft
-  *  10:88516dccf68a added b
+  o  10:88516dccf68a added b
   |   () [default] draft
-  *  9:82b74d5dc678 watbar to a
+  o  9:82b74d5dc678 watbar to a
   |   () [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
@@ -253,7 +250,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
@@ -280,28 +276,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