tests/test-evolve-content-divergent-corner-cases.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4553 aafd51f145ea
parent 4673 3ef4980353af
--- a/tests/test-evolve-content-divergent-corner-cases.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Wed Jun 05 17:56:44 2019 +0200
@@ -62,12 +62,11 @@
   1 changesets pruned
   $ hg prune -s 593c57f2117e "desc('added b')" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg log -G
   @  3:8374d2ddc3a4@default(draft) divergent [content-divergent]
   |
-  | *  2:593c57f2117e@default(draft) divergent [content-divergent]
+  | o  2:593c57f2117e@default(draft) divergent [content-divergent]
   |/
   o  0:9092f1db7931@default(draft) added a []
   
@@ -120,12 +119,11 @@
   1 changesets pruned
   $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg log -G
   @  7:b2ae71172042@default(draft) add _c [content-divergent]
   |
-  | *  6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
+  | o  6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
   |/
   | o  4:45bf1312f454@default(draft) divergent []
   |/
@@ -175,11 +173,10 @@
   1 changesets pruned
   $ hg prune -s 05a6b6a9e633 37445b16603b --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg log -G
   @  3:6b096fb45070@default(draft) bdivergent [content-divergent]
   |
-  | *  2:05a6b6a9e633@default(draft) bdivergent [content-divergent]
+  | o  2:05a6b6a9e633@default(draft) bdivergent [content-divergent]
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
@@ -249,17 +246,15 @@
 Lets create divergence
   $ hg prune 4 -s . --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Making obsolete resolution parent
   $ hg prune 3
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @  6:de4ea3103326 updated e
   |   () [default] draft
-  | *  5:ff6f7cd76a7c updated e
+  | o  5:ff6f7cd76a7c updated e
   | |   () [default] draft
   | x  3:9150fe93bec6 added d
   | |   () [default] draft
@@ -336,18 +331,15 @@
 create some content divergence
 
   $ hg co dff6e52f5e41 --hidden
-  updating to a hidden changeset dff6e52f5e41
-  (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (dff6e52f5e41)
   (use 'hg evolve' to update to its successor: 0825dcee2670)
   $ hg revert -r .^ c
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  3:92ecd58f9b05 delete a
   |   () [default] draft
-  | *  2:0825dcee2670 delete a
+  | o  2:0825dcee2670 delete a
   |/    () [default] draft
   | x  1:dff6e52f5e41 delete a
   |/    () [default] draft