--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 05 17:56:44 2019 +0200
@@ -70,13 +70,10 @@
 
 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
   $ hg up 2 --hidden -q
-  updating to a hidden changeset 155349b645be
-  (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
   working directory parent is obsolete! (155349b645be)
 
   $ echo cc >> c
   $ hg ci --amend -m "updated c"
-  2 new content-divergent changesets
 
 Lets change the phase to --public of branch which is pulled from server:
   $ hg phase --public -r 4
@@ -281,7 +278,6 @@
   1 changesets pruned
   $ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 'max(desc("added d"))'
@@ -290,7 +286,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:e568fd1029bb added c e
+  | o  4:e568fd1029bb added c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -331,7 +327,7 @@
   |  @@ -0,0 +1,1 @@
   |  +c
   |
-  | *  4:e568fd1029bb added c e
+  | o  4:e568fd1029bb added c e
   |/    draft content-divergent
   |
   |    diff -r 5f6d8a4bf34a -r e568fd1029bb c
@@ -367,7 +363,7 @@
   $ hg obslog --all --rev tip --patch
   @  93cd84bbdaca (5) added d
   |
-  | *  e568fd1029bb (4) added c e
+  | o  e568fd1029bb (4) added c e
   |/
   x  9150fe93bec6 (3) added d
        rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -504,7 +500,6 @@
   $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
   rebasing 5:4ab2719bbab9 "c_E"
   rebasing 6:77ccbf8d837e "c_F"
-  2 new content-divergent changesets
 
   $ hg sum
   parent: 8:a52ac76b45f5 
@@ -522,7 +517,7 @@
     content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e)
   
   $ hg log -G --patch
-  *  changeset:   10:8ae8db670b4a
+  o  changeset:   10:8ae8db670b4a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -535,7 +530,7 @@
   |  @@ -0,0 +1,1 @@
   |  +c_F
   |
-  *  changeset:   9:b4a584aea4bd
+  o  changeset:   9:b4a584aea4bd
   |  parent:      3:abb77b893f28
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -635,7 +630,6 @@
   base: [5] c_E
   rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
   merge:[8] c_F
   with: [10] c_F
   base: [6] c_F