--- a/tests/test-evolve-abort-orphan.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-abort-orphan.t	Sat Apr 20 03:55:11 2019 +0200
@@ -78,7 +78,6 @@
   $ echo babar > d
   $ hg add d
   $ hg amend
-  1 new orphan changesets
 
   $ hg evolve --all
   move:[4] added d
@@ -110,7 +109,7 @@
   $ hg glog
   @  5:e93a9161a274 added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -151,7 +150,6 @@
   $ echo bar > c
   $ hg add c
   $ hg amend
-  3 new orphan changesets
 
   $ hg evolve --all
   move:[2] added b
@@ -185,7 +183,7 @@
   |   () draft
   o  7:125af0ed8cae added a
   |   () draft
-  | *  6:e83de241f751 added d
+  | o  6:e83de241f751 added d
   | |   () draft
   | @  5:e93a9161a274 added c
   | |   () draft
@@ -197,18 +195,17 @@
       () draft
 
   $ hg evolve --abort
-  1 new orphan changesets
   evolve aborted
   working directory is now at 125af0ed8cae
 
   $ hg glog
   @  7:125af0ed8cae added a
   |   () draft
-  | *  6:e83de241f751 added d
+  | o  6:e83de241f751 added d
   | |   () draft
-  | *  5:e93a9161a274 added c
+  | o  5:e93a9161a274 added c
   | |   () draft
-  | *  2:b1661037fa25 added b
+  | o  2:b1661037fa25 added b
   | |   () draft
   | x  1:c7586e2a9264 added a
   |/    () draft
@@ -259,7 +256,6 @@
   [1] added a
   $ echo aa > a
   $ hg amend
-  5 new orphan changesets
 
   $ hg evolve --all
   move:[2] added b
@@ -282,11 +278,11 @@
   |   () draft
   | @  6:8f20d4390c21 foo to a
   | |   () draft
-  | | *  5:bcb1c47f8520 added d
+  | | o  5:bcb1c47f8520 added d
   | | |   () draft
   | | x  4:86d2603075a3 added c
   | |/    () draft
-  | | *  3:17509928e5bf added c
+  | | o  3:17509928e5bf added c
   | | |   () draft
   | | x  2:9f0c80a55ddc added b
   | |/    () draft
@@ -296,22 +292,21 @@
       () draft
 
   $ hg evolve --abort
-  2 new orphan changesets
   evolve aborted
   working directory is now at 807e8e2ca559
 
   $ hg glog
   @  7:807e8e2ca559 added a
   |   () draft
-  | *  6:8f20d4390c21 foo to a
+  | o  6:8f20d4390c21 foo to a
   | |   () draft
-  | | *  5:bcb1c47f8520 added d
+  | | o  5:bcb1c47f8520 added d
   | | |   () draft
-  | | *  4:86d2603075a3 added c
+  | | o  4:86d2603075a3 added c
   | |/    () draft
-  | | *  3:17509928e5bf added c
+  | | o  3:17509928e5bf added c
   | | |   () draft
-  | | *  2:9f0c80a55ddc added b
+  | | o  2:9f0c80a55ddc added b
   | |/    () draft
   | x  1:2f913b0c9220 added a
   |/    () draft
@@ -345,11 +340,11 @@
   |   () draft
   | @  6:8f20d4390c21 foo to a
   | |   () draft
-  | | *  5:bcb1c47f8520 added d
+  | | o  5:bcb1c47f8520 added d
   | | |   () draft
   | | x  4:86d2603075a3 added c
   | |/    () draft
-  | | *  3:17509928e5bf added c
+  | | o  3:17509928e5bf added c
   | | |   () draft
   | | x  2:9f0c80a55ddc added b
   | |/    () draft
@@ -374,7 +369,6 @@
   adding file changes
   added 10 changesets with 8 changes to 5 files (+4 heads)
   3 new obsolescence markers
-  3 new orphan changesets
   $ cd ../clonerepo
   $ hg up 7f8e8bd9f0b6
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -466,14 +460,13 @@
   $ echo foo > c
   $ hg add c
   $ hg amend
-  2 new orphan changesets
 
   $ hg glog
   @  4:a0086c17bfc7 added a
   |   () draft
-  | *  3:17509928e5bf added c
+  | o  3:17509928e5bf added c
   | |   () draft
-  | *  2:9f0c80a55ddc added b
+  | o  2:9f0c80a55ddc added b
   | |   (bm1) draft
   | x  1:2f913b0c9220 added a
   |/    () draft
@@ -504,16 +497,15 @@
       () draft
 
   $ hg evolve --abort
-  1 new orphan changesets
   evolve aborted
   working directory is now at a0086c17bfc7
 
   $ hg glog
   @  4:a0086c17bfc7 added a
   |   () draft
-  | *  3:17509928e5bf added c
+  | o  3:17509928e5bf added c
   | |   () draft
-  | *  2:9f0c80a55ddc added b
+  | o  2:9f0c80a55ddc added b
   | |   (bm1) draft
   | x  1:2f913b0c9220 added a
   |/    () draft