--- a/tests/test-evolve-content-divergent-relocation.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu Apr 11 22:44:53 2019 +0200
@@ -41,20 +41,18 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  2 new orphan changesets
 
   $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True
   rebasing 2:b1661037fa25 "added b"
-  2 new content-divergent changesets
 
   $ hg glog
-  *  6:da4b96f4a8d6 added b
+  o  6:da4b96f4a8d6 added b
   |   () [default] draft
   | @  5:7ed0642d644b added b
   | |   () [default] draft
-  | | *  4:c41c793e0ef1 added d
+  | | o  4:c41c793e0ef1 added d
   | | |   () [default] draft
-  | | *  3:ca1b80f7960a added c
+  | | o  3:ca1b80f7960a added c
   | | |   () [default] draft
   | | x  2:b1661037fa25 added b
   | |/    () [default] draft
@@ -76,9 +74,9 @@
   $ hg glog
   @  8:171614c9a791 added b
   |   () [default] draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () [default] draft
-  | *  3:ca1b80f7960a added c
+  | o  3:ca1b80f7960a added c
   | |   () [default] draft
   | x  2:b1661037fa25 added b
   |/    () [default] draft
@@ -139,19 +137,16 @@
   $ hg amend -m "added foo to x"
 
   $ hg up 71a392c714b5 --hidden
-  updating to a hidden changeset 71a392c714b5
-  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (71a392c714b5)
   (use 'hg evolve' to update to its successor: 1e1a50385a7d)
   $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
   rebasing 11:71a392c714b5 "added x"
-  2 new content-divergent changesets
 
   $ hg glog
   @  13:1e4f6b3bb39b added x
   |   () [default] draft
-  | *  12:1e1a50385a7d added foo to x
+  | o  12:1e1a50385a7d added foo to x
   | |   () [bar] draft
   o |  10:4ae4427ee9f8 added d
   | |   () [default] draft
@@ -224,21 +219,18 @@
   $ hg amend
 
   $ hg up fc6ad2bac162 --hidden
-  updating to a hidden changeset fc6ad2bac162
-  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (fc6ad2bac162)
   (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
   $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
   rebasing 16:fc6ad2bac162 "added y"
-  2 new content-divergent changesets
   $ echo wat > y
   $ hg amend
 
   $ hg glog
   @  19:b4575ed6fcfc added y
   |   () [bar] draft
-  | *  17:2a9f6ccbdeba added y
+  | o  17:2a9f6ccbdeba added y
   | |   () [default] draft
   o |  15:b006cf317e0e added foo to x
   | |   () [bar] draft
@@ -359,21 +351,18 @@
   $ hg amend
 
   $ hg up daf1de08f3b0 --hidden
-  updating to a hidden changeset daf1de08f3b0
-  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (daf1de08f3b0)
   (use 'hg evolve' to update to its successor: 3f7a1f693080)
   $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
   rebasing 22:daf1de08f3b0 "added z"
-  2 new content-divergent changesets
   $ echo bar > z
   $ hg amend
 
   $ hg glog
   @  25:53242575ffa9 added z
   |   () [bar] draft
-  | *  23:3f7a1f693080 added z
+  | o  23:3f7a1f693080 added z
   | |   () [default] draft
   o |  21:7bbcf24ddecf added y
   | |   () [bar] draft