tests/test-evolve-public-content-divergent-discard.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4660 b62ed7c69561
--- a/tests/test-evolve-public-content-divergent-discard.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-discard.t	Wed Jun 05 17:56:44 2019 +0200
@@ -70,14 +70,13 @@
   1 changesets pruned
   $ hg prune 2 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 4
 
   $ hg glog
   @  4:f7c1071f1e7c added c
   |   public
   |
-  | *  3:90522bccf499 added ch
+  | o  3:90522bccf499 added ch
   |/    draft content-divergent
   |
   o  1:5f6d8a4bf34a added b
@@ -158,14 +157,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:5acd58ef5066 added dh
+  | o  4:5acd58ef5066 added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -246,14 +244,13 @@
   1 changesets pruned
   $ hg prune 2 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 4
 
   $ hg glog
   @  4:f7c1071f1e7c added c
   |   public
   |
-  | *  3:229da2719b19 added ch
+  | o  3:229da2719b19 added ch
   |/    draft content-divergent
   |
   o  1:5f6d8a4bf34a added b
@@ -357,14 +354,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:f89a8e2f86ac added dh
+  | o  4:f89a8e2f86ac added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -461,14 +457,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:db0b7bba0aae added dh
+  | o  4:db0b7bba0aae added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -565,14 +560,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:67b19bbd770f added dh
+  | o  4:67b19bbd770f added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -654,7 +648,6 @@
   adding d
   $ hg prune -r "min(desc('added d'))" -s . --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 (publish one side)
   $ hg phase --public