tests/test-evolve-content-divergent-corner-cases.t
branchmercurial-4.4
changeset 4516 f54bb6eaf5e6
parent 4513 d70db7e455dc
child 4553 aafd51f145ea
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Apr 11 22:44:53 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 []
   
@@ -122,12 +121,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 []
   |/
@@ -179,11 +177,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 []