--- a/tests/test-evolve-abort-orphan.t Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-evolve-abort-orphan.t Thu Aug 02 02:47:44 2018 +0200
@@ -95,7 +95,7 @@
$ hg glog
@ 5:e93a9161a274 added c
| () draft
- | * 4:c41c793e0ef1 added d
+ | o 4:c41c793e0ef1 added d
| | () draft
| x 3:ca1b80f7960a added c
|/ () draft
@@ -171,9 +171,9 @@
| () draft
o 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
| x 2:b1661037fa25 added b
| | () draft
@@ -183,18 +183,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
@@ -266,13 +265,13 @@
|/ () draft
@ 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
| | x 4:86d2603075a3 added c
| |/ () draft
- | | * 3:17509928e5bf added c
+ | | o 3:17509928e5bf added c
| | | () draft
| | x 2:9f0c80a55ddc added b
| |/ () draft
@@ -282,22 +281,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
@@ -329,13 +327,13 @@
|/ () draft
@ 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
| | x 4:86d2603075a3 added c
| |/ () draft
- | | * 3:17509928e5bf added c
+ | | o 3:17509928e5bf added c
| | | () draft
| | x 2:9f0c80a55ddc added b
| |/ () draft
@@ -360,7 +358,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
@@ -413,7 +410,7 @@
|/ () draft
@ 7:807e8e2ca559 added a
| () draft
- | * 6:8f20d4390c21 foo to a
+ | o 6:8f20d4390c21 foo to a
| | () draft
| x 1:2f913b0c9220 added a
|/ () draft
@@ -457,9 +454,9 @@
$ 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
@@ -481,7 +478,7 @@
| (bm1) draft
o 4:a0086c17bfc7 added a
| () draft
- | * 3:17509928e5bf added c
+ | o 3:17509928e5bf added c
| | () draft
| x 2:9f0c80a55ddc added b
| | () draft
@@ -491,16 +488,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