tests/test-evolve-orphan-corner-cases.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4660 b62ed7c69561
--- a/tests/test-evolve-orphan-corner-cases.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-orphan-corner-cases.t	Wed Jun 05 17:56:44 2019 +0200
@@ -55,7 +55,6 @@
   $ hg up 2 -q
   $ echo "fixit" > c
   $ hg ci --amend -m "updated c"
-  1 new orphan changesets
   $ hg up 3 -q
   $ echo "fixit" > c
   $ hg ci --amend -m "updated f"
@@ -64,7 +63,7 @@
   |
   | o  5:f84f2c548fbc@default(draft) updated c
   |/
-  | *    4:2c0a98d38026@default(draft) merge feature branch
+  | o    4:2c0a98d38026@default(draft) merge feature branch
   | |\
   +---x  3:4c33e511041e@default(draft) added feature f
   | |
@@ -90,11 +89,10 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "updated d" >> d
   $ hg ci --amend -m "updated d"
-  1 new orphan changesets
   $ glog
   @  9:7c4d1834c346@default(draft) updated d
   |
-  | *  8:421f7614462a@default(draft) added e
+  | o  8:421f7614462a@default(draft) added e
   | |
   | x  7:afe5acea1990@default(draft) added d
   |/
@@ -102,7 +100,7 @@
   |/
   | o  5:f84f2c548fbc@default(draft) updated c
   |/
-  | *    4:2c0a98d38026@default(draft) merge feature branch
+  | o    4:2c0a98d38026@default(draft) merge feature branch
   | |\
   +---x  3:4c33e511041e@default(draft) added feature f
   | |