tests/test-evolve-public-content-divergent-main.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4673 3ef4980353af
--- a/tests/test-evolve-public-content-divergent-main.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-main.t	Wed Jun 05 17:56:44 2019 +0200
@@ -48,13 +48,10 @@
 Amend again to create a cset divergent to public one:
 
   $ hg up 1 --hidden -q
-  updating to a hidden changeset 5f6d8a4bf34a
-  (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f)
   working directory parent is obsolete! (5f6d8a4bf34a)
 
   $ echo "I am second" >> b
   $ hg ci --amend -m "updated b"
-  1 new content-divergent changesets
 
   $ hg glog
   @  3:dcdaf152280a updated b
@@ -142,13 +139,10 @@
 Amend again to create a cset divergent to public one:
 
   $ hg up 1 --hidden -q
-  updating to a hidden changeset 5f6d8a4bf34a
-  (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c)
   working directory parent is obsolete! (5f6d8a4bf34a)
 
   $ echo "I am bar" > b
   $ hg ci --amend -m "updated b"
-  1 new content-divergent changesets
 
   $ hg glog
   @  3:0e805383168e updated b
@@ -240,7 +234,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase -r 4 --public
@@ -328,7 +321,6 @@
   1 changesets pruned
   $ hg prune 'min(desc("re:added d$"))' -s 'desc("added d c e")' --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 'max(desc("re:added d$"))'
@@ -337,7 +329,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:f31bcc378766 added d c e
+  | o  4:f31bcc378766 added d c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -457,7 +449,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 5
@@ -466,7 +457,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:9411ad1fe615 added d
+  | o  4:9411ad1fe615 added d
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -550,7 +541,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 5
@@ -559,7 +549,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:3c17c7afaf6e added c e
+  | o  4:3c17c7afaf6e added c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c