diff tests/test-evolve-order.t @ 4516:f54bb6eaf5e6 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

--- a/tests/test-evolve-order.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-order.t	Thu Apr 11 22:44:53 2019 +0200
@@ -44,13 +44,12 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo "aaa" > _a
   $ hg amend
-  2 new orphan changesets
   $ hg log -G
   @  4:12d519679175@default(draft) add _a
   |
-  | *  3:4d156641b718@default(draft) add _c
+  | o  3:4d156641b718@default(draft) add _c
   | |
-  | *  2:4d7242ebb004@default(draft) add _b
+  | o  2:4d7242ebb004@default(draft) add _b
   | |
   | x  1:2d73fcd7f07d@default(draft) add _a
   |/
@@ -72,7 +71,6 @@
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m "aprime"
-  3 new orphan changesets
   $ hg evolve --rev "desc(_b)"
   move:[5] add _b
   atop:[8] aprime
@@ -83,17 +81,16 @@
   $ hg up "desc(aprime)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "asecond"
-  1 new orphan changesets
   $ hg log -G
   @  11:9a584314f3f3@default(draft) asecond
   |
-  | *  10:a59c79776f7c@default(draft) bprime
+  | o  10:a59c79776f7c@default(draft) bprime
   | |
   | x  8:81a687b96d4d@default(draft) aprime
   |/
-  | *  7:464731bc0ed0@default(draft) add _d
+  | o  7:464731bc0ed0@default(draft) add _d
   | |
-  | *  6:52b8f9b04f83@default(draft) add _c
+  | o  6:52b8f9b04f83@default(draft) add _c
   | |
   | x  5:59476c3836ef@default(draft) add _b
   | |
@@ -128,22 +125,20 @@
   $ mkstack "desc(_d)" c1second >/dev/null
   $ hg prune "desc(c1_)" -s "desc(c1prime)"
   1 changesets pruned
-  3 new orphan changesets
   $ hg prune "desc(c2_)" -s "desc(c2prime)"
   1 changesets pruned
   $ hg prune "desc(c1prime)" -s "desc(c1second)"
   1 changesets pruned
-  1 new orphan changesets
   $ hg log -G -r "desc(_d)::"
   @  21:dcf786e878fd@default(draft) add c1second
   |
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | o  20:507d52d715f6@default(draft) add c2prime
   | |
   | x  19:c995cb124ddc@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | o  18:d096a2437fd0@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | o  17:cde95c6cba7a@default(draft) add c3_
   | |
   | x  16:e0d9f7a099fe@default(draft) add c2_
   | |
@@ -158,7 +153,6 @@
   $ mkstack "desc(_d)" b1prime b3prime >/dev/null
   $ hg prune "desc(b1_)" -s "desc(b1prime)"
   1 changesets pruned
-  3 new orphan changesets
   $ hg prune "desc(b3_)" -s "desc(b3prime)"
   1 changesets pruned
   $ hg prune "desc(b2_)"
@@ -169,7 +163,7 @@
   |
   o  26:4acf61f11dfb@default(draft) add b1prime
   |
-  | *  25:594e1fbbd61f@default(draft) add b4_
+  | o  25:594e1fbbd61f@default(draft) add b4_
   | |
   | x  24:be27500cfc76@default(draft) add b3_
   | |
@@ -179,13 +173,13 @@
   |/
   | o  21:dcf786e878fd@default(draft) add c1second
   |/
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | o  20:507d52d715f6@default(draft) add c2prime
   | |
   | x  19:c995cb124ddc@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | o  18:d096a2437fd0@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | o  17:cde95c6cba7a@default(draft) add c3_
   | |
   | x  16:e0d9f7a099fe@default(draft) add c2_
   | |
@@ -245,14 +239,11 @@
   created new head
   $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
   1 changesets pruned
-  1 new orphan changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg up 'desc(b3prime)'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m 'b3second'
-  1 new orphan changesets
   $ hg evolve --rev "orphan()"
   move:[29] add b4_
   atop:[34] b3second