# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555725311 -7200
# Node ID 0eb80259f9cb5c23674c7000bd2686b09cbb6e7d
# Parent  7de160f6c7a952b75ca4f29c7b0572daaf813ef8# Parent  f54bb6eaf5e6d7d1a79c206fcb38dbbacb7955e5
test-compat: merge mercurial-4.5 into mercurial-4.4

diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-discovery-obshashrange.t	Sat Apr 20 03:55:11 2019 +0200
@@ -315,58 +315,17 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending batch command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> taking quick initial sample (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 2; still undecided: 5, sample size is: 5 (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending known command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 2 total queries in *.????s (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> found 1 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "namespaces" (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "namespaces": 40 bytes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (6r) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (6r) (glob)
-  1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (6r, 4o) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; add more sample (target 100, current 1) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; sample size is 9, largest range 5 (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending evoext_obshashrange_v1 command (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (6r, 4o) (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablesort cache reset (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablesort in *.???? seconds (6r) (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-firstmerge cache reset (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-firstmerge in *.???? seconds (6r) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> checking for updated bookmarks (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "bookmarks" (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "bookmarks": 0 bytes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> list of changesets: (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending unbundle command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-bundle: "HG20", 4 parts total (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "replycaps" * bytes payload (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "phase-heads" 24 bytes payload (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "obsmarkers" streamed payload (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: no-transaction (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 1 parts total (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
@@ -1001,7 +960,7 @@
   
   $ hg --config extensions.strip= strip -r 'desc("foo")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob)
   $ hg log -G
   o  7 4de32a90b66c r7 tip
   |
@@ -1153,7 +1112,7 @@
   $ ls -1 .hg/cache/ | grep evoext
   [1]
   $ hg strip -r 5 --config extensions.strip=
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/c8d03c1b5e94-b257442b-backup.hg
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/c8d03c1b5e94-b257442b-backup.hg (glob)
   $ f -s .hg/cache/evoext*
   .hg/cache/evoext-obscache-00: size=70
   $ cd ..
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-abort-orphan.t
--- 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
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-abort-phasediv.t
--- a/tests/test-evolve-abort-phasediv.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-abort-phasediv.t	Sat Apr 20 03:55:11 2019 +0200
@@ -66,7 +66,6 @@
       () draft
 
   $ hg phase -r c41c793e0ef1 --public --hidden
-  1 new phase-divergent changesets
 
   $ hg glog
   @  6:ddba58020bc0 added d
@@ -157,7 +156,6 @@
   $ hg add b
   $ hg amend
   $ hg phase -r c41c793e0ef1 --public --hidden
-  2 new phase-divergent changesets
 
   $ hg evolve --list
   e44ebefe4f54: added d
@@ -186,7 +184,7 @@
   |   () draft
   | x  8:9ff8adbe8a24 added c
   |/    () draft
-  | *  7:e44ebefe4f54 added d
+  | o  7:e44ebefe4f54 added d
   |/    () draft
   | x  6:ddba58020bc0 added d
   |/    () draft
@@ -217,7 +215,6 @@
   [1]
 
   $ hg evolve --abort
-  1 new phase-divergent changesets
   evolve aborted
   working directory is now at 28cd06b3f801
 
@@ -226,7 +223,7 @@
   |   () draft
   | x  8:9ff8adbe8a24 added c
   |/    () draft
-  | *  7:e44ebefe4f54 added d
+  | o  7:e44ebefe4f54 added d
   |/    () draft
   | x  6:ddba58020bc0 added d
   |/    () draft
@@ -255,7 +252,7 @@
   $ hg glog --hidden
   @  10:ef9b72b9b42c added d
   |   () draft
-  | *  9:28cd06b3f801 added c
+  | o  9:28cd06b3f801 added c
   |/    () draft
   | x  8:9ff8adbe8a24 added c
   |/    () draft
@@ -301,14 +298,13 @@
   [1]
 
   $ hg evolve --abort
-  1 new phase-divergent changesets
   evolve aborted
   working directory is now at ef9b72b9b42c
 
   $ hg glog --hidden
   @  10:ef9b72b9b42c added d
   |   () draft
-  | *  9:28cd06b3f801 added c
+  | o  9:28cd06b3f801 added c
   |/    () draft
   | x  8:9ff8adbe8a24 added c
   |/    () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Sat Apr 20 03:55:11 2019 +0200
@@ -107,7 +107,6 @@
   1 changesets pruned
   $ hg prune -s 593c57f2117e "desc('added b')" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg log -G --patch
   @  3:8374d2ddc3a4@default(draft) divergent [content-divergent]
@@ -118,7 +117,7 @@
   |  @@ -0,0 +1,1 @@
   |  +bdivergent
   |
-  | *  2:593c57f2117e@default(draft) divergent [content-divergent]
+  | o  2:593c57f2117e@default(draft) divergent [content-divergent]
   |/   diff --git a/bdivergent1 b/bdivergent1
   |    new file mode 100644
   |    --- /dev/null
@@ -272,12 +271,11 @@
 
   $ hg prune -r 0ac42f1bc15c -s . --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg glog
   @  9:59081c9c425a added a d with bar in it, expect some beers
   |   () [default] draft
-  | *  8:f621d00f5f0e added d
+  | o  8:f621d00f5f0e added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sat Apr 20 03:55:11 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 []
   
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Sat Apr 20 03:55:11 2019 +0200
@@ -54,19 +54,16 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
   $ echo foobar > d
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -129,7 +126,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -152,14 +149,12 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > c
   $ hg amend
-  2 new orphan changesets
   $ hg up ca1b80f7960a --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (ca1b80f7960a)
   (use 'hg evolve' to update to its successor: 2ba73e31f264)
   $ echo foobar > c
   $ hg amend
-  2 new content-divergent changesets
   $ echo bar > c
   $ hg amend
 
@@ -168,13 +163,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -206,7 +201,6 @@
   [1]
 
   $ hg evolve --abort
-  2 new content-divergent changesets
   evolve aborted
   working directory is now at 491e10505bae
 
@@ -215,13 +209,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -235,7 +229,7 @@
       () draft
 
   $ hg obslog -r . --all
-  *  2ba73e31f264 (8) added c
+  o  2ba73e31f264 (8) added c
   |
   | @  491e10505bae (10) added c
   | |
@@ -278,19 +272,16 @@
   $ hg amend
 
   $ hg up --hidden c41c793e0ef1
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
   $ echo bar > d
   $ hg amend
-  2 new content-divergent changesets
 
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -318,7 +309,7 @@
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -342,7 +333,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -373,7 +364,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-content-divergent-relocation.t
--- a/tests/test-evolve-content-divergent-relocation.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-content-divergent-relocation.t	Sat Apr 20 03:55:11 2019 +0200
@@ -41,20 +41,18 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  2 new orphan changesets
 
   $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True
   rebasing 2:b1661037fa25 "added b"
-  2 new content-divergent changesets
 
   $ hg glog
-  *  6:da4b96f4a8d6 added b
+  o  6:da4b96f4a8d6 added b
   |   () [default] draft
   | @  5:7ed0642d644b added b
   | |   () [default] draft
-  | | *  4:c41c793e0ef1 added d
+  | | o  4:c41c793e0ef1 added d
   | | |   () [default] draft
-  | | *  3:ca1b80f7960a added c
+  | | o  3:ca1b80f7960a added c
   | | |   () [default] draft
   | | x  2:b1661037fa25 added b
   | |/    () [default] draft
@@ -76,9 +74,9 @@
   $ hg glog
   @  8:171614c9a791 added b
   |   () [default] draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () [default] draft
-  | *  3:ca1b80f7960a added c
+  | o  3:ca1b80f7960a added c
   | |   () [default] draft
   | x  2:b1661037fa25 added b
   |/    () [default] draft
@@ -139,19 +137,16 @@
   $ hg amend -m "added foo to x"
 
   $ hg up 71a392c714b5 --hidden
-  updating to a hidden changeset 71a392c714b5
-  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (71a392c714b5)
   (use 'hg evolve' to update to its successor: 1e1a50385a7d)
   $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
   rebasing 11:71a392c714b5 "added x"
-  2 new content-divergent changesets
 
   $ hg glog
   @  13:1e4f6b3bb39b added x
   |   () [default] draft
-  | *  12:1e1a50385a7d added foo to x
+  | o  12:1e1a50385a7d added foo to x
   | |   () [bar] draft
   o |  10:4ae4427ee9f8 added d
   | |   () [default] draft
@@ -224,21 +219,18 @@
   $ hg amend
 
   $ hg up fc6ad2bac162 --hidden
-  updating to a hidden changeset fc6ad2bac162
-  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (fc6ad2bac162)
   (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
   $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
   rebasing 16:fc6ad2bac162 "added y"
-  2 new content-divergent changesets
   $ echo wat > y
   $ hg amend
 
   $ hg glog
   @  19:b4575ed6fcfc added y
   |   () [bar] draft
-  | *  17:2a9f6ccbdeba added y
+  | o  17:2a9f6ccbdeba added y
   | |   () [default] draft
   o |  15:b006cf317e0e added foo to x
   | |   () [bar] draft
@@ -359,21 +351,18 @@
   $ hg amend
 
   $ hg up daf1de08f3b0 --hidden
-  updating to a hidden changeset daf1de08f3b0
-  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (daf1de08f3b0)
   (use 'hg evolve' to update to its successor: 3f7a1f693080)
   $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
   rebasing 22:daf1de08f3b0 "added z"
-  2 new content-divergent changesets
   $ echo bar > z
   $ hg amend
 
   $ hg glog
   @  25:53242575ffa9 added z
   |   () [bar] draft
-  | *  23:3f7a1f693080 added z
+  | o  23:3f7a1f693080 added z
   | |   () [default] draft
   o |  21:7bbcf24ddecf added y
   | |   () [bar] draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-content-divergent-stack.t
--- a/tests/test-evolve-content-divergent-stack.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-content-divergent-stack.t	Sat Apr 20 03:55:11 2019 +0200
@@ -64,7 +64,6 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar > a
   $ hg amend -m "watbar to a"
-  3 new orphan changesets
   $ echo wat > a
   $ hg amend -m "watbar to a"
   $ hg evolve --all
@@ -90,7 +89,6 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo wat > a
   $ hg amend -m "watbar to a"
-  3 new orphan changesets
   $ hg evolve --all
   move:[2] added b
   atop:[5] watbar to a
@@ -117,26 +115,25 @@
   adding file changes
   added 4 changesets with 0 changes to 4 files (+1 heads)
   5 new obsolescence markers
-  8 new content-divergent changesets
   new changesets 82b74d5dc678:15c781f93cac
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
-  *  12:15c781f93cac added d
+  o  12:15c781f93cac added d
   |   () [default] draft
-  *  11:9e5fb1d5b955 added c
+  o  11:9e5fb1d5b955 added c
   |   () [default] draft
-  *  10:88516dccf68a added b
+  o  10:88516dccf68a added b
   |   () [default] draft
-  *  9:82b74d5dc678 watbar to a
+  o  9:82b74d5dc678 watbar to a
   |   () [default] draft
   | @  8:c72d2885eb51 added d
   | |   () [default] draft
-  | *  7:3ce4be6d8e5e added c
+  | o  7:3ce4be6d8e5e added c
   | |   () [default] draft
-  | *  6:d5f148423c16 added b
+  | o  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | o  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -148,7 +145,6 @@
   updating to "local" side of the conflict: 8e222f257bbf
   merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[6] added b
   with: [10] added b
   base: [2] added b
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-continue.t	Sat Apr 20 03:55:11 2019 +0200
@@ -38,11 +38,10 @@
   $ echo bar > d
   $ hg add d
   $ hg amend
-  1 new orphan changesets
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -95,12 +94,11 @@
   $ echo bar > e
   $ hg add e
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  8:00a5c774cc37 added d
   |   () draft
-  | *  7:ad0a59d83efe added e
+  | o  7:ad0a59d83efe added e
   | |   () draft
   | x  6:2a4e03d422e2 added d
   |/    () draft
@@ -151,7 +149,6 @@
   $ echo bar > b
   $ hg add b
   $ hg amend
-  3 new orphan changesets
 
   $ hg evolve --all
   move:[2] added b
@@ -214,18 +211,17 @@
   $ echo bar > h
   $ hg add f h
   $ hg amend
-  4 new orphan changesets
 
   $ hg glog
   @  16:645135c5caa4 added c
   |   () draft
-  | *  15:09becba8f97d added h
+  | o  15:09becba8f97d added h
   | |   () draft
-  | *  14:5aa7b2bbd944 added g
+  | o  14:5aa7b2bbd944 added g
   | |   () draft
-  | *  13:be88f889b6dc added f
+  | o  13:be88f889b6dc added f
   | |   () draft
-  | *  12:6642d2c9176e added d
+  | o  12:6642d2c9176e added d
   | |   () draft
   | x  11:95665a2de664 added c
   |/    () draft
@@ -292,7 +288,6 @@
   $ echo bar > g
   $ hg add g
   $ hg amend
-  2 new orphan changesets
 
   $ hg evolve --all --confirm<<EOF
   > y
@@ -343,7 +338,6 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foobar > g
   $ hg amend
-  2 new orphan changesets
 
   $ hg next --evolve
   move:[22] added g
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-cycles.t
--- a/tests/test-evolve-cycles.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-cycles.t	Sat Apr 20 03:55:11 2019 +0200
@@ -50,7 +50,6 @@
 Create a cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  2 new orphan changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune -s "desc(A)" "desc(C)"
@@ -188,7 +187,6 @@
 Create a first cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  5 new orphan changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-issue5832.t
--- a/tests/test-evolve-issue5832.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-issue5832.t	Sat Apr 20 03:55:11 2019 +0200
@@ -52,7 +52,6 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo foo > a
   $ hg amend
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -69,11 +68,11 @@
   |/    () draft
   | o  5:7014ec2829cd added a
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -90,11 +89,11 @@
   |/    () draft
   | o  5:7014ec2829cd added a
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -192,7 +191,6 @@
   $ hg ci -Aqm "added l"
   $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -212,11 +210,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -235,11 +233,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -337,7 +335,6 @@
   $ hg ci -Aqm "added l"
   $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -357,11 +354,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -380,11 +377,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-issue5881.t
--- a/tests/test-evolve-issue5881.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-issue5881.t	Sat Apr 20 03:55:11 2019 +0200
@@ -27,7 +27,6 @@
   adding c
   $ hg up 1 -q
   $ hg ci --amend -m "updated b"
-  1 new orphan changesets
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (5f6d8a4bf34a)
@@ -36,7 +35,7 @@
   $ hg glog
   o  3:e6048a693c0d updated b
   |   () draft
-  | *  2:155349b645be added c
+  | o  2:155349b645be added c
   | |   () draft
   | @  1:5f6d8a4bf34a added b
   |/    () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-issue5966.t
--- a/tests/test-evolve-issue5966.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-issue5966.t	Sat Apr 20 03:55:11 2019 +0200
@@ -40,14 +40,13 @@
 
   $ echo apricot > a
   $ hg amend -m 'apricot'
-  2 new orphan changesets
 
   $ hg glog --hidden
   @  4: apricot
   |
-  | *  3: coconut
+  | o  3: coconut
   | |
-  | *  2: banana
+  | o  2: banana
   | |
   | x  1: apple
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-list.t
--- a/tests/test-evolve-list.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-list.t	Sat Apr 20 03:55:11 2019 +0200
@@ -17,7 +17,6 @@
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a >> a && hg ci --amend -m a
-  2 new orphan changesets
   $ hg evolve --list
   d2ae7f538514: b
     orphan: cb9a9f314b8b (obsolete parent)
@@ -34,7 +33,6 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
   $ hg evolve --list
   88cc282e27fc: ab
     phase-divergent: cb9a9f314b8b (immutable precursor)
@@ -64,7 +62,6 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
   $ hg evolve --list
   c882616e9d84: b
     content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-noupdate.t
--- a/tests/test-evolve-noupdate.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-noupdate.t	Sat Apr 20 03:55:11 2019 +0200
@@ -44,13 +44,12 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  2 new orphan changesets
   $ hg glog
   @  5:7ed0642d644b added b
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
-  | *  3:ca1b80f7960a added c
+  | o  3:ca1b80f7960a added c
   | |   () draft
   | x  2:b1661037fa25 added b
   |/    () draft
@@ -85,16 +84,15 @@
   [1] added a
   $ echo bar > a
   $ hg amend
-  3 new orphan changesets
   $ hg up 7ed0642d644b
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg glog
   o  8:3d41537b44ca added a
   |   () draft
-  | *  7:b6b20b8eefdc added d
+  | o  7:b6b20b8eefdc added d
   | |   () draft
-  | *  6:7c46f743e62f added c
+  | o  6:7c46f743e62f added c
   | |   () draft
   | @  5:7ed0642d644b added b
   | |   () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Sat Apr 20 03:55:11 2019 +0200
@@ -231,14 +231,10 @@
   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update --hidden 0dec01379d3b
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-amend.t	Sat Apr 20 03:55:11 2019 +0200
@@ -199,8 +199,6 @@
   (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   [255]
   $ hg update --hidden "desc(A0)"
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Sat Apr 20 03:55:11 2019 +0200
@@ -67,7 +67,6 @@
 ------------------------
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
-  4 new orphan changesets
   2 changesets folded
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
@@ -94,7 +93,7 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   8:d15d0ffc75f6
+  | o  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -208,7 +207,6 @@
   record this change to 'D'? [Ynesfdaq?] Y
   
   no more change to split
-  1 new orphan changesets
   $ hg split --rev "desc(fold2)" -d "0 0" << EOF
   > Y
   > Y
@@ -243,7 +241,6 @@
   record this change to 'F'? [Ynesfdaq?] Y
   
   no more change to split
-  1 new orphan changesets
   $ hg log -G
   @  changeset:   15:d4a000f63ee9
   |  tag:         tip
@@ -252,20 +249,20 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  *  changeset:   14:ec31316faa9d
+  o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   13:d0f33db50670
+  | o  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     fold1
   | |
-  | *  changeset:   12:7b3290f6e0a0
+  | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -328,14 +325,14 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  *  changeset:   14:ec31316faa9d
+  o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   12:7b3290f6e0a0
+  | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -384,7 +381,7 @@
 walking algorithm works no matter the level of successors + precursors
 
   $ hg obslog 12
-  *    7b3290f6e0a0 (12) fold1
+  o    7b3290f6e0a0 (12) fold1
   |\
   x |    d15d0ffc75f6 (8) fold1
   |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -412,11 +409,11 @@
   $ hg obslog --all 15
   o  19e14c8397fc (10) fold0
   |
-  | *    7b3290f6e0a0 (12) fold1
+  | o    7b3290f6e0a0 (12) fold1
   | |\
   | | | @  d4a000f63ee9 (15) fold2
   | | | |
-  | | | | *  ec31316faa9d (14) fold2
+  | | | | o  ec31316faa9d (14) fold2
   | | | |/|
   | | | x |    100cc25b765f (9) fold2
   | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-content-divergent.t
--- a/tests/test-evolve-obshistory-content-divergent.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t	Sat Apr 20 03:55:11 2019 +0200
@@ -37,13 +37,10 @@
      summary:     ROOT
   
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
@@ -53,7 +50,7 @@
   |  instability: content-divergent
   |  summary:     A2
   |
-  | *  changeset:   2:fdf9bde5129a
+  | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -100,7 +97,7 @@
   $ hg obslog --hidden --all 471f378eab4c --patch
   @  65b757b745b9 (3) A2
   |
-  | *  fdf9bde5129a (2) A1
+  | o  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -163,7 +160,7 @@
 Check that debugobshistory on the first diverged revision show the revision
 and the diverent one
   $ hg obslog fdf9bde5129a --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -188,7 +185,7 @@
   $ hg obslog fdf9bde5129a -a --patch
   @  65b757b745b9 (3) A2
   |
-  | *  fdf9bde5129a (2) A1
+  | o  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -235,7 +232,7 @@
   $ hg obslog 65b757b745b9 -a --patch
   @  65b757b745b9 (3) A2
   |
-  | *  fdf9bde5129a (2) A1
+  | o  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -260,7 +257,7 @@
   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
   @  65b757b745b9 (3) A2
   |
-  | *  fdf9bde5129a (2) A1
+  | o  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -337,8 +334,6 @@
   (use --hidden to access hidden revisions; diverged)
   [255]
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' has diverged)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-fold.t
--- a/tests/test-evolve-obshistory-fold.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-fold.t	Sat Apr 20 03:55:11 2019 +0200
@@ -229,8 +229,6 @@
   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -239,8 +237,6 @@
   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(B0)'
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Sat Apr 20 03:55:11 2019 +0200
@@ -281,8 +281,6 @@
   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   [255]
   $ hg update --hidden 'min(desc(A0))'
-  updating to a hidden changeset de7290d8b885
-  (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (de7290d8b885)
   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-phase-divergent.t
--- a/tests/test-evolve-obshistory-phase-divergent.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-phase-divergent.t	Sat Apr 20 03:55:11 2019 +0200
@@ -37,15 +37,12 @@
      summary:     ROOT
   
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg phase -p .
-  1 new phase-divergent changesets
   $ hg log --hidden -G
-  *  changeset:   2:fdf9bde5129a
+  o  changeset:   2:fdf9bde5129a
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
@@ -81,7 +78,7 @@
 
 Check that with all option, every changeset is shown
   $ hg obslog --hidden --all 471f378eab4c --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -121,7 +118,7 @@
 Check that debugobshistory on the first diverged revision show the revision
 and the diverent one
   $ hg obslog fdf9bde5129a --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -136,7 +133,7 @@
 
 Check that all option show all of them
   $ hg obslog fdf9bde5129a -a --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -151,7 +148,7 @@
 Check that debugobshistory on the second diverged revision show the revision
 and the diverent one
   $ hg obslog fdf9bde5129a --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -165,7 +162,7 @@
   
 Check that all option show all of them
   $ hg obslog fdf9bde5129a -a --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -180,7 +177,7 @@
 Check that debugobshistory on the both diverged revision show a coherent
 graph
   $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch
-  *  fdf9bde5129a (2) A1
+  o  fdf9bde5129a (2) A1
   |
   @  471f378eab4c (1) A0
        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-prune.t
--- a/tests/test-evolve-obshistory-prune.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-prune.t	Sat Apr 20 03:55:11 2019 +0200
@@ -106,8 +106,6 @@
   (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg up --hidden -r 'desc(B0)'
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' is pruned)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its parent successor)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-obshistory-split.t
--- a/tests/test-evolve-obshistory-split.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-obshistory-split.t	Sat Apr 20 03:55:11 2019 +0200
@@ -203,8 +203,6 @@
   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   [255]
   $ hg update --hidden 'min(desc(A0))'
-  updating to a hidden changeset 471597cad322
-  (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471597cad322)
   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-order.t	Sat Apr 20 03:55:11 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
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-orphan-merge.t	Sat Apr 20 03:55:11 2019 +0200
@@ -51,12 +51,11 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  4:64370c9805e7 added b
   |   () draft
-  | *    3:3b2b6f4652ee merging a and b
+  | o    3:3b2b6f4652ee merging a and b
   | |\    () draft
   +---x  2:d76850646258 added b
   | |     () draft
@@ -96,12 +95,11 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > a
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  6:3d41537b44ca added a
   |   () draft
-  | *    5:91fd62122a4b merging a and b
+  | o    5:91fd62122a4b merging a and b
   | |\    () draft
   +---o  4:64370c9805e7 added b
   | |     () draft
@@ -177,7 +175,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ echo foobar > c
   $ hg resolve -m
@@ -200,12 +198,11 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo FOO > c
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  11:31c317b7bdb1 foo to c
   |   () draft
-  | *    10:fd41d25a3e90 foobar to c
+  | o    10:fd41d25a3e90 foobar to c
   | |\    () draft
   +---o  9:d0f84b25d4e3 bar to c
   | |     () draft
@@ -255,12 +252,11 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > c
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  13:928097d0b5b5 foo to c
   |   () draft
-  | *    12:c5405d2da7a1 foobar to c
+  | o    12:c5405d2da7a1 foobar to c
   | |\    () draft
   +---x  11:31c317b7bdb1 foo to c
   | |     () draft
@@ -329,18 +325,17 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo bar > l
   $ hg amend
-  2 new orphan changesets
 
   $ hg glog
   @  20:fccc9de66799 added l
   |   () draft
-  | *    19:190763373d8b merge commit
+  | o    19:190763373d8b merge commit
   | |\    () draft
   | | o  18:863d11043c67 added y
   | | |   () draft
   +---o  17:3f2247835c1d added x
   | |     () draft
-  | *  16:e44dc179e7f5 added m
+  | o  16:e44dc179e7f5 added m
   | |   () draft
   | x  15:8634bee7bf1e added l
   |/    () draft
@@ -391,7 +386,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo foobar > l
   $ hg amend
-  1 new orphan changesets
   $ hg up 3f2247835c1d
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > x
@@ -401,7 +395,7 @@
   |   () draft
   | o  24:3f371171d767 added l
   |/    () draft
-  | *    23:7b78a9784f3e merged l and x
+  | o    23:7b78a9784f3e merged l and x
   | |\    () draft
   +---x  20:fccc9de66799 added l
   | |     () draft
@@ -459,7 +453,6 @@
 
   $ hg prune -r cdf6547da25f
   1 changesets pruned
-  1 new orphan changesets
   $ hg glog
   @    27:adb665a78e08 merged l and x
   |\    () draft
@@ -497,7 +490,6 @@
 
   $ hg prune -r 3f371171d767
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @    28:fb8fe870ae7d merged l and x
@@ -567,7 +559,6 @@
 
   $ hg prune -r f3ba8b99bb6f
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @    31:32beb84b9dbc merge commit
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-orphan-split.t
--- a/tests/test-evolve-orphan-split.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-orphan-split.t	Sat Apr 20 03:55:11 2019 +0200
@@ -60,14 +60,13 @@
   
   created new head
   continue splitting? [Ycdq?] c
-  1 new orphan changesets
 
   $ hg glog
   @  4:8b179cffc81c added a and b
   |   () draft
   o  3:bd3735d4dab0 added a and b
   |   () draft
-  | *  2:86e1ebf1ca61 added c
+  | o  2:86e1ebf1ca61 added c
   | |   () draft
   | x  1:d0ddb614efbd added a and b
   |/    () draft
@@ -153,14 +152,13 @@
   
   created new head
   continue splitting? [Ycdq?] c
-  1 new orphan changesets
 
   $ hg glog
   @  9:c0fbf8aaf6c4 added a b c
   |   () draft
   o  8:f2632392aefe added a b c
   |   () draft
-  | *  7:d48a30875f01 added d
+  | o  7:d48a30875f01 added d
   | |   () draft
   | x  6:f89e4764f2ed added a b c
   |/    () draft
@@ -174,7 +172,7 @@
   |   () draft
   | o  8:f2632392aefe added a b c
   |/    () draft
-  | *  7:d48a30875f01 added d
+  | o  7:d48a30875f01 added d
   | |   () draft
   | x  6:f89e4764f2ed added a b c
   |/    () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Sat Apr 20 03:55:11 2019 +0200
@@ -123,7 +123,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -292,7 +291,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -445,7 +443,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -575,7 +572,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x
@@ -584,17 +580,8 @@
        rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg glog -r .^::
-  @  10:334e300d6db5 added x to x
-  |   (bm) draft
-  | o  9:2352021b3785 added x to x
-  | |   () public
-  | o  8:502e73736632 phase-divergent update to b756eb10ea73:
-  | |   () public
-  | o  6:b756eb10ea73 added bar to bar
-  |/    () public
-  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |   () public
-  ~
+  hg: parse error at 4: not a prefix: end
+  [255]
 
 Using `hg evolve` to resolve phase-divergence
 ---------------------------------------------
@@ -687,7 +674,6 @@
 Alice making the old changeset public to have content-divergence
 
   $ hg phase -r dc88f5aa9bc9 --public --hidden
-  1 new phase-divergent changesets
   $ hg glog
   @  14:13015a180eee y to y and foobar to foo
   |   () draft
@@ -791,7 +777,6 @@
   
 
   $ hg phase -r f3794e5a91dc --public --hidden
-  1 new phase-divergent changesets
 
 Resolution using `hg evolve --phase-divergent`
 ----------------------------------------------
@@ -899,7 +884,6 @@
   $ hg evolve --list
 
   $ hg phase -r 428f7900a969 --public --hidden
-  1 new phase-divergent changesets
 
   $ hg glog -r f3794e5a91dc::
   @  24:390acb97e50a added f
@@ -976,12 +960,11 @@
   1 changesets pruned
 
   $ hg phase -r a51bce62c219 --hidden --public
-  2 new phase-divergent changesets
 
   $ hg glog
   @  3:e1154ec0206a added n
   |   () draft
-  *  2:4f25cd9cd2bf added m
+  o  2:4f25cd9cd2bf added m
   |   () draft
   | o  1:a51bce62c219 added m and n
   |/    () public
@@ -1104,12 +1087,11 @@
   1 changesets pruned
 
   $ hg phase -r 90859808ece6 --public --hidden
-  2 new phase-divergent changesets
 
   $ hg glog
   @  3:bb87595f9a77 added q
   |   () draft
-  | *  2:a47263294745 added p
+  | o  2:a47263294745 added p
   |/    () draft
   | o  1:90859808ece6 added p and q
   |/    () public
@@ -1391,7 +1373,6 @@
   1 changesets pruned
 
   $ hg phase 205b2f5ecb7b --hidden --public
-  1 new phase-divergent changesets
 
 Resolution of phase-divergent merge commit using `hg evolve`
 
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-phase.t	Sat Apr 20 03:55:11 2019 +0200
@@ -32,7 +32,6 @@
   [1] b
   $ echo b2>b
   $ hg amend
-  1 new orphan changesets
   $ hg evolve
   move:[2] c
   atop:[3] b
@@ -70,12 +69,11 @@
   [1] b
   $ echo b2 > a
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | *  2 - 13833940840c c (secret)
+  | o  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-split.t
--- a/tests/test-evolve-split.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-split.t	Sat Apr 20 03:55:11 2019 +0200
@@ -44,13 +44,12 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
   $ hg log -G
   @  4:d0dcf24cddd3@default(draft) _pp
   |
   o  3:a7fdfda64c08@default(draft) _oo
   |
-  | *  2:f52200b086ca@default(draft) add uu
+  | o  2:f52200b086ca@default(draft) add uu
   | |
   | x  1:d55647aaa0c6@default(draft) oo+pp
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-stop-orphan.t
--- a/tests/test-evolve-stop-orphan.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-stop-orphan.t	Sat Apr 20 03:55:11 2019 +0200
@@ -70,11 +70,10 @@
   $ echo bar > d
   $ hg add d
   $ hg amend
-  1 new orphan changesets
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -116,7 +115,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -156,7 +155,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -221,18 +220,17 @@
   $ echo bar > c
   $ hg add c
   $ hg amend
-  4 new orphan changesets
 
   $ hg glog
   @  7:21817cd42526 added hgignore
       () draft
-  *  6:2a4e03d422e2 added d
+  o  6:2a4e03d422e2 added d
   |   () draft
-  *  5:cb6a2ab625bb added c
+  o  5:cb6a2ab625bb added c
   |   () draft
-  *  2:b1661037fa25 added b
+  o  2:b1661037fa25 added b
   |   () draft
-  *  1:c7586e2a9264 added a
+  o  1:c7586e2a9264 added a
   |   () draft
   x  0:8fa14d15e168 added hgignore
       () draft
@@ -263,9 +261,9 @@
   |   () draft
   o  7:21817cd42526 added hgignore
       () draft
-  *  6:2a4e03d422e2 added d
+  o  6:2a4e03d422e2 added d
   |   () draft
-  *  5:cb6a2ab625bb added c
+  o  5:cb6a2ab625bb added c
   |   () draft
   x  2:b1661037fa25 added b
   |   () draft
@@ -334,16 +332,15 @@
   [8] added a
   $ echo tom > c
   $ hg amend
-  3 new orphan changesets
 
   $ hg glog
   @  12:a3cc2042492f added a
   |   () draft
-  | *  11:cd0909a30222 added d
+  | o  11:cd0909a30222 added d
   | |   () draft
-  | *  10:cb1dd1086ef6 added c
+  | o  10:cb1dd1086ef6 added c
   | |   (b1) draft
-  | *  9:aec285328e90 added b
+  | o  9:aec285328e90 added b
   | |   (b2) draft
   | x  8:fd00db71edca added a
   |/    () draft
@@ -369,9 +366,9 @@
   |   (b2) draft
   o  12:a3cc2042492f added a
   |   () draft
-  | *  11:cd0909a30222 added d
+  | o  11:cd0909a30222 added d
   | |   () draft
-  | *  10:cb1dd1086ef6 added c
+  | o  10:cb1dd1086ef6 added c
   | |   (b1) draft
   | x  9:aec285328e90 added b
   | |   () draft
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-stop-phasediv.t
--- a/tests/test-evolve-stop-phasediv.t	Sat Apr 20 03:55:10 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-Tests for the --stop flag for `hg evolve` command while resolving phase-divergence
-==================================================================================
-
-The `--stop` flag stops the interrupted evolution and delete the state file so
-user can do other things and comeback and do evolution later on
-
-This is testing cases when `hg evolve` command is doing phase-divergence resolution.
-
-Setup
-=====
-
-  $ cat >> $HGRCPATH <<EOF
-  > [alias]
-  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
-  > [extensions]
-  > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
-
-  $ hg init stoprepo
-  $ cd stoprepo
-  $ echo ".*\.orig" > .hgignore
-  $ hg add .hgignore
-  $ hg ci -m "added hgignore"
-  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
-
-  $ hg glog
-  @  4:c41c793e0ef1 added d
-  |   () draft
-  o  3:ca1b80f7960a added c
-  |   () draft
-  o  2:b1661037fa25 added b
-  |   () draft
-  o  1:c7586e2a9264 added a
-  |   () draft
-  o  0:8fa14d15e168 added hgignore
-      () draft
-
-Creating phase divergence, resolution of which will lead to conflicts
-----------------------------------------------------------------------
-
-  $ hg up .^^^
-  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg pick -r .~-3
-  picking 4:c41c793e0ef1 "added d"
-  $ echo foobar > c
-  $ hg add c
-  $ hg amend
-
-  $ hg glog --hidden
-  @  6:ddba58020bc0 added d
-  |   () draft
-  | x  5:cfe30edc6125 added d
-  |/    () draft
-  | x  4:c41c793e0ef1 added d
-  | |   () draft
-  | o  3:ca1b80f7960a added c
-  | |   () draft
-  | o  2:b1661037fa25 added b
-  |/    () draft
-  o  1:c7586e2a9264 added a
-  |   () draft
-  o  0:8fa14d15e168 added hgignore
-      () draft
-
-  $ hg phase -r c41c793e0ef1 --public --hidden
-  1 new phase-divergent changesets
-
-  $ hg glog
-  @  6:ddba58020bc0 added d
-  |   () draft
-  | o  4:c41c793e0ef1 added d
-  | |   () public
-  | o  3:ca1b80f7960a added c
-  | |   () public
-  | o  2:b1661037fa25 added b
-  |/    () public
-  o  1:c7586e2a9264 added a
-  |   () public
-  o  0:8fa14d15e168 added hgignore
-      () public
-  $ hg evolve --phase-divergent
-  recreate:[6] added d
-  atop:[4] added d
-  rebasing to destination parent: ca1b80f7960a
-  merging c
-  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
-  [1]
-
-  $ hg evolve --stop
-  stopped the interrupted evolve
-  working directory is now at ca1b80f7960a
-
-XXX: maybe we should update wdir to where it was
-  $ hg glog
-  *  6:ddba58020bc0 added d
-  |   () draft
-  | o  4:c41c793e0ef1 added d
-  | |   () public
-  | @  3:ca1b80f7960a added c
-  | |   () public
-  | o  2:b1661037fa25 added b
-  |/    () public
-  o  1:c7586e2a9264 added a
-  |   () public
-  o  0:8fa14d15e168 added hgignore
-      () public
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-templates.t	Sat Apr 20 03:55:11 2019 +0200
@@ -63,8 +63,6 @@
 Check templates
 ---------------
   $ hg up 'desc(A0)' --hidden
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -156,8 +154,6 @@
   
 
   $ hg up 'desc(A1)' --hidden
-  updating to a hidden changeset a468dc9b3633
-  (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (a468dc9b3633)
   (use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -332,8 +328,6 @@
 ---------------
 
   $ hg up 'obsolete()' --hidden
-  updating to a hidden changeset 471597cad322
-  (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471597cad322)
   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
@@ -463,8 +457,6 @@
 ---------------
 
   $ hg up 'desc(A0)' --hidden
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -490,8 +482,6 @@
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -597,13 +587,10 @@
      summary:     ROOT
   
   $ hg update --hidden 'desc(A0)'
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
@@ -613,7 +600,7 @@
   |  instability: content-divergent
   |  summary:     A2
   |
-  | *  changeset:   2:fdf9bde5129a
+  | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -638,18 +625,16 @@
 ---------------
 
   $ hg up 'desc(A0)' --hidden
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' has diverged)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 
 Precursors template should show current revision as it is the working copy
   $ hg tlog
-  *  019fadeab383
+  o  019fadeab383
   |    Precursors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
-  | *  fdf9bde5129a
+  | o  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   | @  471f378eab4c
@@ -661,9 +646,9 @@
   o  ea207398892e
   
   $ hg fatelog
-  *  019fadeab383
+  o  019fadeab383
   |
-  | *  fdf9bde5129a
+  | o  fdf9bde5129a
   |/
   | @  471f378eab4c
   |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
@@ -676,7 +661,7 @@
 Precursors template should not show precursors as it's not displayed in the
 log
   $ hg tlog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -684,7 +669,7 @@
   
 
   $ hg fatelog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -692,7 +677,7 @@
   
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
-  *  019fadeab383
+  o  019fadeab383
   |    Precursors: 3:65b757b745b9
   |    semi-colon: 3:65b757b745b9
   | x  65b757b745b9
@@ -714,7 +699,7 @@
   o  ea207398892e
   
   $ hg fatelog --hidden
-  *  019fadeab383
+  o  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: reworded using amend as 4:019fadeab383
@@ -802,8 +787,6 @@
 ---------------
 
   $ hg up 'desc(A0)' --hidden
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -827,8 +810,6 @@
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -861,8 +842,6 @@
   
 
   $ hg up 'desc(B1)' --hidden
-  updating to a hidden changeset b7ea6d14e664
-  (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (b7ea6d14e664)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -1101,7 +1080,6 @@
 
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
   obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
@@ -1120,8 +1098,6 @@
   o  ea207398892e
   
   $ hg up -r "desc(B0)" --hidden
-  updating to a hidden changeset 0dec01379d3b
-  (hidden revision '0dec01379d3b' is pruned)
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
   (use 'hg evolve' to update to its parent successor)
@@ -1318,14 +1294,12 @@
   $ hg up 6
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend -m "Add only B"
-  1 new orphan changesets
 
   $ hg up 6 --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (4a004186e638)
   (use 'hg evolve' to update to its successor: b18bc8331526)
   $ hg commit --amend -m "Add B only"
-  4 new content-divergent changesets
 
   $ hg log -G
   @  changeset:   9:0b997eb7ceee
@@ -1336,14 +1310,14 @@
   |  instability: content-divergent
   |  summary:     Add B only
   |
-  | *  changeset:   8:b18bc8331526
+  | o  changeset:   8:b18bc8331526
   |/   parent:      5:dd800401bd8c
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     Add only B
   |
-  | *  changeset:   7:ba2ed02b0c9a
+  | o  changeset:   7:ba2ed02b0c9a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan, content-divergent
@@ -1356,7 +1330,7 @@
   |    obsolete:    reworded using amend as 9:0b997eb7ceee
   |    summary:     Add A,B,C
   |
-  *  changeset:   5:dd800401bd8c
+  o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1381,10 +1355,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
@@ -1392,7 +1366,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1401,14 +1375,14 @@
   $ hg fatelog
   @  0b997eb7ceee
   |
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1418,10 +1392,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
   | x  4a004186e638
@@ -1432,7 +1406,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | x  9bd10a0775e4
@@ -1463,14 +1437,14 @@
   $ hg fatelog --hidden
   @  0b997eb7ceee
   |
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | x  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -1486,24 +1460,22 @@
   o  ea207398892e
   
   $ hg up --hidden 4
-  updating to a hidden changeset 9bd10a0775e4
-  (hidden revision '9bd10a0775e4' has diverged)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (9bd10a0775e4)
   (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg rebase -r 7 -d 8 --config extensions.rebase=
   rebasing 7:ba2ed02b0c9a "Add A,B,C"
   $ hg tlog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
-  | *  0b997eb7ceee
+  | o  0b997eb7ceee
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
-  * |  b18bc8331526
+  o |  b18bc8331526
   |/     Precursors: 4:9bd10a0775e4
   |      semi-colon: 4:9bd10a0775e4
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | @  9bd10a0775e4
@@ -1517,13 +1489,13 @@
   o  ea207398892e
   
   $ hg fatelog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
-  | *  0b997eb7ceee
+  | o  0b997eb7ceee
   | |
-  * |  b18bc8331526
+  o |  b18bc8331526
   |/
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | @  9bd10a0775e4
   |/     Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
@@ -1551,8 +1523,6 @@
 ------------
 
   $ hg up "desc(A0)" --hidden
-  updating to a hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' is pruned)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its parent successor)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-topic.t	Sat Apr 20 03:55:11 2019 +0200
@@ -89,7 +89,6 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ddd >> ddd
   $ hg amend
-  6 new orphan changesets
   $ hg up 'desc(fff)'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo fff >> fff
@@ -100,17 +99,17 @@
   |
   | o  10 - {foo} d9cacd156ffc add ddd (draft)
   | |
-  | | *  9 - {bar} 1d964213b023 add jjj (draft)
+  | | o  9 - {bar} 1d964213b023 add jjj (draft)
   | | |
-  | | *  8 - {bar} fcab990f3261 add iii (draft)
+  | | o  8 - {bar} fcab990f3261 add iii (draft)
   | | |
-  | | *  7 - {bar} b0c2554835ac add hhh (draft)
+  | | o  7 - {bar} b0c2554835ac add hhh (draft)
   | | |
-  | | *  6 - {bar} c748293f1c1a add ggg (draft)
+  | | o  6 - {bar} c748293f1c1a add ggg (draft)
   | | |
   +---x  5 - {foo} 6a6b7365c751 add fff (draft)
   | |
-  * |  4 - {foo} 3969ab847d9c add eee (draft)
+  o |  4 - {foo} 3969ab847d9c add eee (draft)
   | |
   x |  3 - {foo} 4e3a154f38c7 add ddd (draft)
   |/
@@ -144,13 +143,13 @@
   |
   o  10 - {foo} d9cacd156ffc add ddd (draft)
   |
-  | *  9 - {bar} 1d964213b023 add jjj (draft)
+  | o  9 - {bar} 1d964213b023 add jjj (draft)
   | |
-  | *  8 - {bar} fcab990f3261 add iii (draft)
+  | o  8 - {bar} fcab990f3261 add iii (draft)
   | |
-  | *  7 - {bar} b0c2554835ac add hhh (draft)
+  | o  7 - {bar} b0c2554835ac add hhh (draft)
   | |
-  | *  6 - {bar} c748293f1c1a add ggg (draft)
+  | o  6 - {bar} c748293f1c1a add ggg (draft)
   | |
   | x  5 - {foo} 6a6b7365c751 add fff (draft)
   | |
@@ -256,7 +255,6 @@
   o  0 - {} 199cc73e9a0b add aaa (draft)
   
   $ hg topic -r 070c5573d8f9 bar
-  4 new orphan changesets
   changed topic on 1 changesets to "bar"
   $ hg up 16d6f664b17c
   switching to topic bar
@@ -282,13 +280,13 @@
   $ hg log --graph
   @  18 - {bar} 793eb6370b2d add fff (draft)
   |
-  | *  17 - {bar} 9bf430c106b7 add jjj (draft)
+  | o  17 - {bar} 9bf430c106b7 add jjj (draft)
   | |
-  | *  16 - {bar} d2dc89c57700 add iii (draft)
+  | o  16 - {bar} d2dc89c57700 add iii (draft)
   | |
-  | *  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  | o  15 - {bar} 20bc4d02aa62 add hhh (draft)
   | |
-  | *  14 - {bar} 16d6f664b17c add ggg (draft)
+  | o  14 - {bar} 16d6f664b17c add ggg (draft)
   | |
   | x  13 - {foo} 070c5573d8f9 add fff (draft)
   |/
@@ -318,15 +316,15 @@
   working directory parent is obsolete! (20bc4d02aa62)
   (use 'hg evolve' to update to its successor: d834582d9ee3)
   $ hg log -Gr 14::
-  *  19 - {bar} d834582d9ee3 add hhh (draft)
+  o  19 - {bar} d834582d9ee3 add hhh (draft)
   |
-  | *  17 - {bar} 9bf430c106b7 add jjj (draft)
+  | o  17 - {bar} 9bf430c106b7 add jjj (draft)
   | |
-  | *  16 - {bar} d2dc89c57700 add iii (draft)
+  | o  16 - {bar} d2dc89c57700 add iii (draft)
   | |
   | @  15 - {bar} 20bc4d02aa62 add hhh (draft)
   |/
-  *  14 - {bar} 16d6f664b17c add ggg (draft)
+  o  14 - {bar} 16d6f664b17c add ggg (draft)
   |
   ~
 
@@ -339,15 +337,13 @@
 
   $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
   rebasing 16:d2dc89c57700 "add iii" (bar)
-  1 new orphan changesets
   rebasing 17:9bf430c106b7 "add jjj" (bar)
-  1 new orphan changesets
   $ hg log -Gr 42b49017ff90::
-  *  21 - {bar} 7542e76aba2c add jjj (draft)
+  o  21 - {bar} 7542e76aba2c add jjj (draft)
   |
-  *  20 - {bar} 7858bd7e9906 add iii (draft)
+  o  20 - {bar} 7858bd7e9906 add iii (draft)
   |
-  *  19 - {bar} d834582d9ee3 add hhh (draft)
+  o  19 - {bar} d834582d9ee3 add hhh (draft)
   |
   | o  18 - {bar} 793eb6370b2d add fff (draft)
   | |
@@ -399,17 +395,16 @@
   $ echo "changes in hhh" > hhh
   $ hg add hhh
   $ hg ci --amend
-  4 new orphan changesets
   $ hg log -G
   @  26 - {bar} 2c295936ac04 add fff (draft)
   |
-  | *  25 - {bar} 38a82cbb794a add jjj (draft)
+  | o  25 - {bar} 38a82cbb794a add jjj (draft)
   | |
-  | *  24 - {bar} 4a44eba0fdb3 add iii (draft)
+  | o  24 - {bar} 4a44eba0fdb3 add iii (draft)
   | |
-  | *  23 - {bar} 7acd9ea5d677 add hhh (draft)
+  | o  23 - {bar} 7acd9ea5d677 add hhh (draft)
   | |
-  | *  22 - {bar} 735c7bd8f133 add ggg (draft)
+  | o  22 - {bar} 735c7bd8f133 add ggg (draft)
   | |
   | x  18 - {bar} 793eb6370b2d add fff (draft)
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-evolve.t
--- a/tests/test-evolve.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve.t	Sat Apr 20 03:55:11 2019 +0200
@@ -343,7 +343,6 @@
 (amend of on ancestors)
 
   $ hg amend
-  1 new orphan changesets
   $ hg log
   4	feature-A: a nifty feature - test
   3	feature-B: another feature (child of 568a468b60fc) - test
@@ -353,7 +352,7 @@
   $ glog --hidden
   o  4:ba0ec09b1bab@default(draft) a nifty feature
   |
-  | *  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+  | o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
   | |
   | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
   | |/
@@ -392,7 +391,6 @@
 phase change turning obsolete changeset public issues a phase divergence warning
 
   $ hg phase --hidden --public 99833d22b0c6
-  1 new phase-divergent changesets
 
 all solving phase-divergent
 
@@ -438,16 +436,15 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed -i'' -e s/Un/Én/ main-file-1
   $ hg commit --amend -m 'dansk!'
-  2 new orphan changesets
 
 (ninja test for the {trouble} template:
 
   $ hg log -G --template '{rev} {troubles}\n'
   @  10
   |
-  | *  9 orphan
+  | o  9 orphan
   | |
-  | *  8 orphan
+  | o  8 orphan
   | |
   | x  7
   |/
@@ -825,7 +822,6 @@
   $ hg ci -m c
   $ hg prune .^
   1 changesets pruned
-  1 new orphan changesets
   $ hg stab --any
   move:[15] c
   atop:[13] a
@@ -902,7 +898,6 @@
   marked working directory as branch mybranch
   (branches are permanent and global, did you want a bookmark?)
   $ hg amend
-  1 new orphan changesets
 
   $ hg evolve
   move:[3] a3
@@ -924,7 +919,6 @@
   $ hg up 'desc(a1)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg amend -m 'a1_'
-  2 new orphan changesets
   $ hg evolve
   move:[4] a2
   atop:[6] a1_
@@ -948,14 +942,13 @@
   $ hg up -r "desc('a1_')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci --amend -m 'a1__'
-  2 new orphan changesets
 
   $ hg up -r "desc('a2')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
   o  9 [default] a1__
   |
-  | *  8 [mybranch] a3
+  | o  8 [mybranch] a3
   | |
   | @  7 [mybranch] a2
   | |
@@ -989,7 +982,7 @@
   |
   o  9:9f8b83c2e7f3@default(draft) a1__
   |
-  | *  8:777c26ca5e78@mybranch(draft) a3
+  | o  8:777c26ca5e78@mybranch(draft) a3
   | |
   | x  7:eb07e22a0e63@mybranch(draft) a2
   | |
@@ -1009,7 +1002,7 @@
   |
   @  9 [default] a1__
   |
-  | *  8 [mybranch] a3
+  | o  8 [mybranch] a3
   | |
   | x  7 [mybranch] a2
   | |
@@ -1021,7 +1014,6 @@
   $ hg add newfile
   $ hg commit -m "add new file bumped" -o 10
   $ hg phase --public --hidden d952e93add6f
-  1 new phase-divergent changesets
   $ hg log -G
   @  11	: add new file bumped - test
   |
@@ -1029,7 +1021,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | *  8	: a3 - test
+  | o  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1048,7 +1040,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | *  8	: a3 - test
+  | o  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1104,13 +1096,12 @@
   o  0	: a0 - test
   
   $ hg amend
-  2 new orphan changesets
   $ glog
   @  16:0cf3707e8971@default(draft) a3
   |
-  | *  15:daa1ff1c7fbd@default(draft) add gh
+  | o  15:daa1ff1c7fbd@default(draft) add gh
   | |
-  | | *  14:484fb3cfa7f2@default(draft) add gg
+  | | o  14:484fb3cfa7f2@default(draft) add gg
   | |/
   | x  13:b88539ad24d7@default(draft) a3
   |/
@@ -1250,8 +1241,6 @@
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 
   $ hg --hidden up 14
-  updating to a hidden changeset 484fb3cfa7f2
-  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (484fb3cfa7f2)
   $ cat >> $HGRCPATH <<EOF
@@ -1259,8 +1248,6 @@
   > evolutioncommands=evolve
   > EOF
   $ hg --hidden up 15
-  updating to a hidden changeset daa1ff1c7fbd
-  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (daa1ff1c7fbd)
   (use 'hg evolve' to update to its successor: 0c049e4e5422)
@@ -1283,13 +1270,12 @@
   $ echo "hello" > j4
   $ hg add j4
   $ hg amend
-  2 new orphan changesets
   $ glog -r "0cf3707e8971::"
   @  22:274b6cd0c101@default(draft) add j1
   |
-  | *  21:89e4f7e8feb5@default(draft) add j3
+  | o  21:89e4f7e8feb5@default(draft) add j3
   | |
-  | *  20:4cd61236beca@default(draft) add j2
+  | o  20:4cd61236beca@default(draft) add j2
   | |
   | x  19:0fd8bfb02de4@default(draft) add j1
   |/
@@ -1327,9 +1313,9 @@
   $ glog -r "0cf3707e8971::"
   @  23:0ef9ff75f8e2@default(draft) add j1
   |
-  | *  21:89e4f7e8feb5@default(draft) add j3
+  | o  21:89e4f7e8feb5@default(draft) add j3
   | |
-  | *  20:4cd61236beca@default(draft) add j2
+  | o  20:4cd61236beca@default(draft) add j2
   | |
   | x  19:0fd8bfb02de4@default(draft) add j1
   |/
@@ -1454,13 +1440,12 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
   $ glog -r "0cf3707e8971::"
   @  32:c7dbf668e9d5@default(draft) _pp
   |
   o  31:2b5a32114b3d@default(draft) _oo
   |
-  | *  30:4d122571f3b6@default(draft) add uu
+  | o  30:4d122571f3b6@default(draft) add uu
   | |
   | x  29:7da3e73df8a5@default(draft) oo+pp
   |/
@@ -1521,7 +1506,6 @@
   $ hg update -q 98c7ab460e6b
   $ echo "amended" > newfile
   $ hg amend -m "amended"
-  2 new orphan changesets
 
   $ hg evolve --rev "98c7ab460e6b::"
   move:[35] will be evolved safely
@@ -1569,8 +1553,6 @@
   @  1:ab832e43dd5a added a
   
   $ hg up f7ad41964313 --hidden
-  updating to a hidden changeset f7ad41964313
-  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (f7ad41964313)
   (use 'hg evolve' to update to its successor: ab832e43dd5a)
@@ -1627,7 +1609,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"
@@ -1636,7 +1617,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
   | |
@@ -1662,11 +1643,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
   |/
@@ -1674,7 +1654,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
   | |
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Sat Apr 20 03:55:11 2019 +0200
@@ -74,7 +74,6 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -179,7 +178,6 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -250,7 +248,6 @@
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 1 new obsolescence markers
   remote: obsoleted 1 changesets
-  remote: 1 new orphan changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -267,7 +264,6 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   obsoleted 1 changesets
-  1 new orphan changesets
   new changesets e5ea8f9c7314
   (run 'hg heads' to see heads, 'hg merge' to merge)
   ## post pull state
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -65,11 +65,10 @@
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
-  | *  06055a7959d4 (draft): B
+  | o  06055a7959d4 (draft): B
   | |
   | x  28b51eb45704 (draft): A0
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Sat Apr 20 03:55:11 2019 +0200
@@ -71,7 +71,6 @@
   $ mkcommit B1
   $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  2 new orphan changesets
   $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
   $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
@@ -81,7 +80,7 @@
   |
   @  e5ea8f9c7314 (draft): A1
   |
-  | *  1d0f3cd25300 (draft): C
+  | o  1d0f3cd25300 (draft): C
   | |
   | x  6e72f0a95b5e (draft): B0
   | |
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-C1.t
--- a/tests/test-exchange-obsmarkers-case-C1.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-C1.t	Sat Apr 20 03:55:11 2019 +0200
@@ -58,7 +58,6 @@
   $ mkcommit A
   $ mkcommit B
   $ hg prune -qd '0 0' '.~1'
-  1 new orphan changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  f6fbb35d8ac9 (draft): B
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-C4.t
--- a/tests/test-exchange-obsmarkers-case-C4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -67,7 +67,6 @@
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
   obsoleted 1 changesets
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
-  2 new content-divergent changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  7f7f229b13a6 (draft): C
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Sat Apr 20 03:55:11 2019 +0200
@@ -62,7 +62,6 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg prune -d '0 0' 'desc(B)'
   1 changesets pruned
   $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -60,7 +60,6 @@
   $ mkcommit B1
   $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
   $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   obsoleted 1 changesets
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-fold.t
--- a/tests/test-fold.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-fold.t	Sat Apr 20 03:55:11 2019 +0200
@@ -247,7 +247,6 @@
 Test order of proposed commit message
 
   $ hg fold --exact --hidden -r 4 -r 5 -r 6
-  2 new content-divergent changesets
   3 changesets folded
   $ hg log -r tip -T '{desc}'
   r4
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-issue-5720.t	Sat Apr 20 03:55:11 2019 +0200
@@ -45,11 +45,10 @@
   [1] b
   $ echo b2 > a
   $ hg amend
-  1 new orphan changesets
   $ hg log -G -T "{rev}: {phase}"
   @  3: draft
   |
-  | *  2: secret
+  | o  2: secret
   | |
   | x  1: draft
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-issue-6028.t
--- a/tests/test-issue-6028.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-issue-6028.t	Sat Apr 20 03:55:11 2019 +0200
@@ -106,7 +106,6 @@
 create instability by pruning two changesets, one in a topic, one in a merge
   $ hg prune -r 5:6
   2 changesets pruned
-  3 new orphan changesets
 
   $ hg up 4
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-obsolete-push.t
--- a/tests/test-obsolete-push.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-obsolete-push.t	Sat Apr 20 03:55:11 2019 +0200
@@ -27,7 +27,6 @@
   $ hg phase --secret --force .
   $ hg prune 0 1
   2 changesets pruned
-  1 new orphan changesets
   $ glog --hidden
   @  2:244232c2222a@default(secret) C
   |
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-obsolete.t	Sat Apr 20 03:55:11 2019 +0200
@@ -121,8 +121,6 @@
   4
   - 725c380fe99b
   $ hg up --hidden 3 -q
-  updating to a hidden changeset 0d3f46688ccc
-  (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b)
   working directory parent is obsolete! (0d3f46688ccc)
 (reported by parents too)
   $ hg parents
@@ -136,7 +134,6 @@
   working directory parent is obsolete! (0d3f46688ccc)
   (use 'hg evolve' to update to its successor: 725c380fe99b)
   $ mkcommit d # 5 (on 3)
-  1 new orphan changesets
   $ qlog -r 'obsolete()'
   3
   - 0d3f46688ccc
@@ -188,7 +185,6 @@
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   2 new obsolescence markers
-  1 new orphan changesets
   $ hg -R ../other-new verify
   checking changesets
   checking manifests
@@ -212,7 +208,6 @@
   $ hg up --hidden 3 -q
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
-  1 new orphan changesets
   created new head
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
@@ -271,7 +266,6 @@
   $ hg up --hidden -q .^ # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
-  1 new orphan changesets
   created new head
   $ hg debugobsolete `getid 6` `getid 7`
   obsoleted 1 changesets
@@ -362,7 +356,6 @@
   $ hg up --hidden .^ -q # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d''"
-  1 new orphan changesets
   created new head
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
@@ -428,7 +421,6 @@
   $ hg id -n
   9
   $ hg debugobsolete `getid 0` `getid 9`
-  1 new phase-divergent changesets
 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
 # at core level the warning is not issued
 # this is now a big issue now that we have phase divergence warning
@@ -488,7 +480,7 @@
 check rebase compat
 
   $ hg log -G  --template='{rev} - {node|short} {desc}\n'
-  *  8 - 159dfc9fa5d3 add obsol_d''
+  o  8 - 159dfc9fa5d3 add obsol_d''
   |
   | o  4 - 725c380fe99b add obsol_c'
   | |
@@ -502,7 +494,7 @@
   $ hg log -G  --template='{rev} - {node|short} {desc}\n' --hidden
   x  9 - 83b5778897ad add toto
   
-  *  8 - 159dfc9fa5d3 add obsol_d''
+  o  8 - 159dfc9fa5d3 add obsol_d''
   |
   | x  7 - 909a0fb57e5d add obsol_d'
   |/
@@ -527,7 +519,6 @@
   $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
   rebasing 3:0d3f46688ccc "add obsol_c"
   rebasing 8:159dfc9fa5d3 "add obsol_d''"
-  2 new content-divergent changesets
   $ hg --hidden log -q -r 'successors(3)'
   4:725c380fe99b
   10:2033b4e49474
@@ -536,9 +527,9 @@
   $ hg log -G --template='{rev} - {node|short} {desc}\n'
   @  11 - 9468a5f5d8b2 add obsol_d''
   |
-  *  10 - 2033b4e49474 add obsol_c
+  o  10 - 2033b4e49474 add obsol_c
   |
-  *  4 - 725c380fe99b add obsol_c'
+  o  4 - 725c380fe99b add obsol_c'
   |
   o  1 - 7c3bad9141dc add b
   |
@@ -557,7 +548,6 @@
   added 2 changesets with 1 changes to [12] files (re)
   3 new obsolescence markers
   obsoleted 1 changesets
-  2 new content-divergent changesets
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -579,7 +569,6 @@
 
   $ cd local
   $ hg phase --hidden --public 11
-  1 new phase-divergent changesets
   $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
   @  12 - (draft) 6db5e282cb91 add obsol_d'''
   |
@@ -625,7 +614,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add f
   |
-  | *  changeset:   12:6db5e282cb91
+  | o  changeset:   12:6db5e282cb91
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -688,7 +677,6 @@
   phases: 3 draft
   phase-divergent: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
-  2 new content-divergent changesets
   $ hg log -r 'contentdivergent()'
   changeset:   12:6db5e282cb91
   parent:      10:2033b4e49474
@@ -707,8 +695,6 @@
   
 
   $ hg up --hidden 3 -q
-  updating to a hidden changeset 0d3f46688ccc
-  (hidden revision '0d3f46688ccc' has diverged)
   working directory parent is obsolete! (0d3f46688ccc)
   $ hg evolve
   parent is obsolete with multiple successors:
@@ -727,14 +713,11 @@
 Check import reports new unstable changeset:
 
   $ hg up --hidden 2
-  updating to a hidden changeset 4538525df7e2
-  (hidden revision '4538525df7e2' has diverged)
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (4538525df7e2)
   (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
-  1 new orphan changesets
 
 
 Relevant marker computation
@@ -749,7 +732,7 @@
   |  instability: orphan
   |  summary:     add obsol_d''
   |
-  | *  changeset:   15:50f11e5e3a63
+  | o  changeset:   15:50f11e5e3a63
   | |  parent:      11:9468a5f5d8b2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -769,7 +752,7 @@
   | | |    obsolete:    amended using amend as 14:705ab2a6b72e
   | | |    summary:     add f
   | | |
-  | | | *  changeset:   12:6db5e282cb91
+  | | | o  changeset:   12:6db5e282cb91
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-pick.t
--- a/tests/test-pick.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-pick.t	Sat Apr 20 03:55:11 2019 +0200
@@ -108,7 +108,6 @@
 
   $ hg pick 7c3bad9141dc
   picking 1:7c3bad9141dc "add b"
-  1 new orphan changesets
   $ hg glog
   @  5:7c15c05db6fa add b
   |
@@ -116,7 +115,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -137,7 +136,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -221,11 +220,8 @@
   $ echo foo > b
   $ hg ci -Aqm "foo to b"
   $ hg glog -r .^::
-  @  10:c437988de89f foo to b
-  |
-  o  8:44e155eb95c7 add c
-  |
-  ~
+  hg: parse error at 4: not a prefix: end
+  [255]
 
   $ hg pick -r 7c15c05db6fa
   picking 5:7c15c05db6fa "add b"
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-prev-next.t	Sat Apr 20 03:55:11 2019 +0200
@@ -183,7 +183,6 @@
 some aspiring children
 
   $ hg amend -m 'added b (2)'
-  1 new orphan changesets
   $ hg next --no-evolve
   no children
   (1 unstable changesets to be evolved here, do you want --evolve?)
@@ -230,7 +229,6 @@
 next with ambiguity in aspiring children
 
   $ hg am -m 'added b (3)'
-  2 new orphan changesets
   $ hg next --no-evolve
   no children
   (2 unstable changesets to be evolved here, do you want --evolve?)
@@ -252,7 +250,7 @@
   |
   o  6:d7f119adc759 added b (3)
   |
-  | *  5:9df671ccd2c7 added d
+  | o  5:9df671ccd2c7 added d
   | |
   | x  3:9ad178109a19 added b (2)
   |/
@@ -348,7 +346,6 @@
   $ sleep 1
   $ hg next --evolve
   waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
-  1 new orphan changesets
   got lock after (\d+) seconds (re)
   move:[2] two
   atop:[3] one
@@ -369,7 +366,6 @@
   $ echo foobar > bar
   $ hg add bar
   $ hg amend
-  1 new orphan changesets
 
   $ echo babar > bar
 
@@ -555,7 +551,6 @@
   record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
-  1 new orphan changesets
 
   $ hg up 3 -q
   $ hg log -GT "{rev}:{node|short} {desc}\n"
@@ -567,18 +562,17 @@
   |
   |
   |  new desc
-  | *  2:fdc998261dcb C
+  | o  2:fdc998261dcb C
   | |
   | x  1:cc0edb0cc2b1 B
   |/
   o  0:cae96ff49c84 A
   
   $ hg ci --amend -m "B modified"
-  1 new orphan changesets
   $ hg log -GT "{rev}:{node|short} {desc}\n"
   @  5:64ab03d3110c B modified
   |
-  | *  4:279f6cab32b5 B
+  | o  4:279f6cab32b5 B
   | |
   | |
   | |  new desc
@@ -586,7 +580,7 @@
   |/
   |
   |    new desc
-  | *  2:fdc998261dcb C
+  | o  2:fdc998261dcb C
   | |
   | x  1:cc0edb0cc2b1 B
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-prune.t
--- a/tests/test-prune.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-prune.t	Sat Apr 20 03:55:11 2019 +0200
@@ -69,7 +69,6 @@
 
   $ hg prune 1
   1 changesets pruned
-  2 new orphan changesets
   $ hg book -i BABAR
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-pullbundle.t
--- a/tests/test-pullbundle.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-pullbundle.t	Sat Apr 20 03:55:11 2019 +0200
@@ -48,24 +48,71 @@
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 0: "CHANGEGROUP"
   bundle2-output: header chunk size: 44
-  bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 22368
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 1888
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 1: "CHANGEGROUP"
   bundle2-output: header chunk size: 43
-  bundle2-output: payload chunk size: 23564
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 3084
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 2: "CHANGEGROUP"
   bundle2-output: header chunk size: 42
-  bundle2-output: payload chunk size: 11788
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 4096
+  bundle2-output: payload chunk size: 3596
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
@@ -108,12 +155,52 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 22368
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 1888
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
@@ -126,7 +213,12 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 23564
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 3084
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
@@ -139,7 +231,9 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 11788
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 4096
+  bundle2-input: payload chunk size: 3596
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
@@ -204,8 +298,8 @@
   bundle2-input: end of bundle2 stream
   bundle2-input-bundle: 7 parts total
   checking for updated bookmarks
+  new changesets 1ea73414a91b:f864bc82f6a2
   updating the branch cache
-  new changesets 1ea73414a91b:f864bc82f6a2
   (run 'hg update' to get a working copy)
 
   $ touch oldbundles
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-partial-C2.t	Sat Apr 20 03:55:11 2019 +0200
@@ -61,11 +61,10 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
-  | *  d73caddc5533 (draft): B0
+  | o  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-partial-C4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -61,11 +61,10 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
-  | *  d73caddc5533 (draft): B0
+  | o  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t	Sat Apr 20 03:55:11 2019 +0200
@@ -61,7 +61,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t	Sat Apr 20 03:55:11 2019 +0200
@@ -61,7 +61,6 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -62,7 +62,6 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t	Sat Apr 20 03:55:11 2019 +0200
@@ -65,7 +65,6 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
-  2 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(C0)"`
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t	Sat Apr 20 03:55:11 2019 +0200
@@ -68,7 +68,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B1)"`
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t	Sat Apr 20 03:55:11 2019 +0200
@@ -61,7 +61,6 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t	Sat Apr 20 03:55:11 2019 +0200
@@ -64,7 +64,6 @@
   $ mkcommit A1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t	Sat Apr 20 03:55:11 2019 +0200
@@ -70,7 +70,6 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t	Sat Apr 20 03:55:11 2019 +0200
@@ -70,7 +70,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t	Sat Apr 20 03:55:11 2019 +0200
@@ -65,7 +65,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg up 0
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t	Sat Apr 20 03:55:11 2019 +0200
@@ -68,7 +68,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sat Apr 20 03:55:11 2019 +0200
@@ -84,7 +84,6 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t	Sat Apr 20 03:55:11 2019 +0200
@@ -73,7 +73,6 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
-  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -108,6 +107,5 @@
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
   obsoleted 1 changesets
-  1 new orphan changesets
 
   $ cd ../..
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-rewind.t
--- a/tests/test-rewind.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-rewind.t	Sat Apr 20 03:55:11 2019 +0200
@@ -261,20 +261,19 @@
 `````````````
 
   $ hg rewind --hidden --to 'desc("c_B0")' --as-divergence
-  2 new content-divergent changesets
   rewinded to 1 changesets
   $ hg debugobsolete
   7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
   $ hg obslog --rev 'desc("c_B0")'
-  *  48acf2c0d9c8 (4) c_B0
+  o  48acf2c0d9c8 (4) c_B0
   |
   x  7e594302a05d (2) c_B0
        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
        rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
   
   $ hg log -G
-  *  changeset:   4:48acf2c0d9c8
+  o  changeset:   4:48acf2c0d9c8
   |  tag:         tip
   |  parent:      1:579f120ba918
   |  user:        test
@@ -300,7 +299,7 @@
      summary:     c_ROOT
   
   $ hg log -G --hidden
-  *  changeset:   4:48acf2c0d9c8
+  o  changeset:   4:48acf2c0d9c8
   |  tag:         tip
   |  parent:      1:579f120ba918
   |  user:        test
@@ -660,7 +659,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo AA >> A
   $ hg amend -m 'c_A1'
-  1 new orphan changesets
   $ hg evolve --all
   move:[2] c_B0
   atop:[3] c_A1
@@ -702,7 +700,6 @@
 `````````````
 
   $ hg rewind --hidden --to 'min(desc(c_B0))' --exact
-  1 new orphan changesets
   rewinded to 1 changesets
   (1 changesets obsoleted)
   working directory is now at 96622b0702dd
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-sharing.t
--- a/tests/test-sharing.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-sharing.t	Sat Apr 20 03:55:11 2019 +0200
@@ -485,13 +485,12 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  2 new content-divergent changesets
   new changesets e3f99ce9d9cd
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
-  *  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+  o  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   |
   | @  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-split.t
--- a/tests/test-split.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-split.t	Sat Apr 20 03:55:11 2019 +0200
@@ -150,7 +150,6 @@
 Split a revision specified with -r
   $ echo "change to b" >> _b
   $ hg amend -m "_cprim"
-  2 new orphan changesets
   $ hg evolve --all
   move:[5] split1
   atop:[7] _cprim
@@ -206,7 +205,6 @@
   
   created new head
   continue splitting? [Ycdq?] c
-  2 new orphan changesets
 
 Stop before splitting the commit completely creates a commit with all the
 remaining changes
@@ -715,7 +713,6 @@
   new file mode 100644
   $ hg add SPLIT3
   $ hg amend
-  1 new orphan changesets
   $ hg export
   # HG changeset patch
   # User test
@@ -1051,7 +1048,6 @@
   record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
-  1 new orphan changesets
 
   $ hg glog -p
   @  4:5cf253fa63fa split2 (draft)
@@ -1070,7 +1066,7 @@
   |  @@ -0,0 +1,1 @@
   |  +a
   |
-  | *  2:ab6ca3ebca74 c (draft)
+  | o  2:ab6ca3ebca74 c (draft)
   | |  diff --git a/c b/c
   | |  new file mode 100644
   | |  --- /dev/null
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-stabilize-conflict.t	Sat Apr 20 03:55:11 2019 +0200
@@ -76,7 +76,6 @@
    neuf
    dix
   $ hg amend
-  1 new orphan changesets
   $ hg evolve
   move:[2] babar count up to fifteen
   atop:[3] babar count up to ten
@@ -122,7 +121,6 @@
   -dix
   +ten
   $ hg amend
-  1 new orphan changesets
   $ hg evolve
   move:[4] babar count up to fifteen
   atop:[5] babar count up to ten
@@ -209,7 +207,6 @@
   -ten
   +zehn
   $ hg amend
-  1 new orphan changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-stabilize-order.t	Sat Apr 20 03:55:11 2019 +0200
@@ -38,20 +38,18 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
   $ hg gdown
   gdown have been deprecated in favor of previous
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] adda
   $ echo a >> a
   $ hg amend
-  1 new orphan changesets
   $ glog
   @  5:005fe5914f78@default(draft) adda
   |
-  | *  4:22619daeed78@default(draft) addb
+  | o  4:22619daeed78@default(draft) addb
   | |
-  | | *  3:7a7552255fb5@default(draft) addc
+  | | o  3:7a7552255fb5@default(draft) addc
   | | |
   | | x  2:ef23d6ef94d6@default(draft) addb
   | |/
@@ -78,7 +76,7 @@
   |
   o  5:005fe5914f78@default(draft) adda
   |
-  | *  3:7a7552255fb5@default(draft) addc
+  | o  3:7a7552255fb5@default(draft) addc
   | |
   | x  2:ef23d6ef94d6@default(draft) addb
   | |
@@ -136,11 +134,10 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
   $ glog
   @  8:7a68bc4596ea@default(draft) addb
   |
-  | *  7:0f691739f917@default(draft) addc
+  | o  7:0f691739f917@default(draft) addc
   | |
   | x  6:81b8bbcd5892@default(draft) addb
   |/
@@ -194,7 +191,6 @@
   $ hg up .^
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend -m "newmessage"
-  2 new orphan changesets
   $ hg log -G
   @  changeset:   12:f83a0bce03e4
   |  tag:         tip
@@ -203,14 +199,14 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     newmessage
   |
-  | *  changeset:   11:fa68011f392e
+  | o  changeset:   11:fa68011f392e
   | |  parent:      9:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     secondambiguous
   | |
-  | | *  changeset:   10:bdc003b6eec2
+  | | o  changeset:   10:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    instability: orphan
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-stack-branch.t
--- a/tests/test-stack-branch.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-stack-branch.t	Sat Apr 20 03:55:11 2019 +0200
@@ -109,13 +109,12 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
-  2 new orphan changesets
   $ hg log -G
   @  6 foo {} draft c_d
   |
-  | *  5 foo {} draft c_f
+  | o  5 foo {} draft c_f
   | |
-  | *  4 foo {} draft c_e
+  | o  4 foo {} draft c_e
   | |
   | x  3 foo {} draft c_d
   |/
@@ -226,7 +225,6 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
-  4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
   rebasing 9:2ebb6e48ab8a "c_g"
   rebasing 10:634f38e27a1d "c_h"
@@ -237,9 +235,9 @@
   |
   @  11 foo {} draft c_D
   |
-  | *  8 foo {} draft c_f
+  | o  8 foo {} draft c_f
   | |
-  | *  7 foo {} draft c_e
+  | o  7 foo {} draft c_e
   | |
   | x  6 foo {} draft c_d
   |/
@@ -271,9 +269,9 @@
   |
   @  11 foo {} draft c_D
   |
-  | *  8 foo {} draft c_f
+  | o  8 foo {} draft c_f
   | |
-  | *  7 foo {} draft c_e
+  | o  7 foo {} draft c_e
   | |
   | x  6 foo {} draft c_d
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-change.t
--- a/tests/test-topic-change.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-change.t	Sat Apr 20 03:55:11 2019 +0200
@@ -148,7 +148,6 @@
 Changing topic in between the stack
 
   $ hg topic -r 9::10 --current
-  5 new orphan changesets
   changed topic on 2 changesets to "foobar"
   $ hg glog
   o  22:1b88140feefe {foobar}
@@ -160,16 +159,16 @@
   | @  20:c2d6b7df5dcf {foobar}
   | |  Added h  ()
   | |
-  | *  18:e7b418d79a05 {bar}
+  | o  18:e7b418d79a05 {bar}
   | |  Added g  ()
   | |
-  | *  17:82e0b14f4d9e {bar}
+  | o  17:82e0b14f4d9e {bar}
   | |  Added f  ()
   | |
-  | *  16:edc4a6b9ea60 {bar}
+  | o  16:edc4a6b9ea60 {bar}
   | |  Added e  ()
   | |
-  | *  11:1315a3808ed0 {foo}
+  | o  11:1315a3808ed0 {foo}
   | |  Added d  ()
   | |
   | x  10:1fa891977a22 {foo}
@@ -375,14 +374,13 @@
 
   $ hg topic -r . watwat
   switching to topic watwat
-  1 new orphan changesets
   changed topic on 1 changesets to "watwat"
 
   $ hg glog
   @  33:894983f69e69 {watwat}
   |  Added g  ()
   |
-  | *  32:1b83d11095b9 {movebook}
+  | o  32:1b83d11095b9 {movebook}
   | |  Added h  (book bookboo)
   | |
   | x  26:7c76c271395f {bar}
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-debugcb.t
--- a/tests/test-topic-debugcb.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-debugcb.t	Sat Apr 20 03:55:11 2019 +0200
@@ -255,12 +255,11 @@
   changed topic to "bar" on 2 revisions
   switching to topic foo
   changed topic to "foo" on 2 revisions
-  2 new orphan changesets
 
   $ hg log -G
   @  [9:b14d13efcfa7] E
   |    topic: foo
-  *  [8:c89ca6e70978] D
+  o  [8:c89ca6e70978] D
   |    topic: foo
   | o  [7:a3ea0dfe6a10] C
   | |    topic: bar
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-stack-complex.t	Sat Apr 20 03:55:11 2019 +0200
@@ -81,7 +81,6 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] c
-  1 new orphan changesets
 
   $ hg stack
   ### topic: foo
@@ -95,7 +94,7 @@
   $ hg show work
   @  5cce (foo) split2
   o  f26c (foo) split1
-  | *  f1d3 (foo) Added e and f
+  | o  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
@@ -114,13 +113,12 @@
   +foo
 
   $ hg amend
-  1 new orphan changesets
   $ hg show work
   @  7d94 (foo) split1
-  | *  5cce (foo) split2
+  | o  5cce (foo) split2
   | x  f26c (foo) split1
   |/
-  | *  f1d3 (foo) Added e and f
+  | o  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
@@ -148,14 +146,10 @@
   $ hg id -r .
   ec94a1ed1330 tip
   $ hg up --hidden 'min(precursors(.))'
-  updating to a hidden changeset f1d3649d6a8b
-  (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (f1d3649d6a8b)
   (use 'hg evolve' to update to its successor: ec94a1ed1330)
   $ hg amend -d '0 1'
-  1 new orphan changesets
-  2 new content-divergent changesets
   $ hg rebase -r . -d ec94a1ed1330~1
   rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
   $ hg stack
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-stack-data.t
--- a/tests/test-topic-stack-data.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-stack-data.t	Sat Apr 20 03:55:11 2019 +0200
@@ -75,7 +75,6 @@
   $ hg up 'desc(fuz_a)'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg commit --amend --message 'fuz1_a'
-  2 new orphan changesets
 
 A topic with multiple heads
 
@@ -95,7 +94,6 @@
   $ hg up 'desc(bar_d)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend --message 'bar1_d'
-  1 new orphan changesets
 
 topic 'foo' on the multi headed branch
 
@@ -127,7 +125,7 @@
   |
   | o  bar1_d (default) [bar]
   | |
-  | | *  add bar_e (default) [bar]
+  | | o  add bar_e (default) [bar]
   | | |
   | | x  add bar_d (default) [bar]
   | |/
@@ -139,9 +137,9 @@
   | |
   | | o  fuz1_a (default) [fuz]
   | | |
-  | | | *  add fuz_c (default) [fuz]
+  | | | o  add fuz_c (default) [fuz]
   | | | |
-  | | | *  add fuz_b (default) [fuz]
+  | | | o  add fuz_b (default) [fuz]
   | | | |
   | | | x  add fuz_a (default) [fuz]
   | | |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-stack.t	Sat Apr 20 03:55:11 2019 +0200
@@ -311,13 +311,12 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
-  2 new orphan changesets
   $ hg log -G
   @  6 default {foo} draft c_d
   |
-  | *  5 default {foo} draft c_f
+  | o  5 default {foo} draft c_f
   | |
-  | *  4 default {foo} draft c_e
+  | o  4 default {foo} draft c_e
   | |
   | x  3 default {foo} draft c_d
   |/
@@ -446,7 +445,6 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
-  4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
   rebasing 9:81264ae8a36a "c_g" (foo)
   rebasing 10:fde5f5941642 "c_h" (foo)
@@ -457,9 +455,9 @@
   |
   @  11 default {foo} draft c_D
   |
-  | *  8 default {foo} draft c_f
+  | o  8 default {foo} draft c_f
   | |
-  | *  7 default {foo} draft c_e
+  | o  7 default {foo} draft c_e
   | |
   | x  6 default {foo} draft c_d
   |/
@@ -500,9 +498,9 @@
   |
   @  11 default {foo} draft c_D
   |
-  | *  8 default {foo} draft c_f
+  | o  8 default {foo} draft c_f
   | |
-  | *  7 default {foo} draft c_e
+  | o  7 default {foo} draft c_e
   | |
   | x  6 default {foo} draft c_d
   |/
@@ -537,20 +535,19 @@
 Changing topics on some commits in between
   $ hg topic foobar -r 'desc(c_e) + desc(c_D)'
   switching to topic foobar
-  4 new orphan changesets
   changed topic on 2 changesets to "foobar"
   $ hg log -G
   @  17 default {foobar} draft c_D
   |
-  | *  16 default {foobar} draft c_e
+  | o  16 default {foobar} draft c_e
   | |
-  | | *  15 default {foo} draft c_f
+  | | o  15 default {foo} draft c_f
   | | |
   | | x  14 default {foo} draft c_e
   | |/
-  | *  13 default {foo} draft c_h
+  | o  13 default {foo} draft c_h
   | |
-  | *  12 default {foo} draft c_g
+  | o  12 default {foo} draft c_g
   | |
   | x  11 default {foo} draft c_D
   |/
@@ -563,7 +560,6 @@
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
   rebasing 15:77082e55de88 "c_f" (foo)
   switching to topic foo
-  1 new orphan changesets
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
   rebasing 12:0c3e8aed985d "c_g" (foo)
@@ -717,7 +713,6 @@
   switching to topic red
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   $ hg commit --amend --user test2
-  7 new orphan changesets
   $ hg up 'desc("c_C")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg commit --amend --user test2
@@ -729,21 +724,21 @@
   $ hg log -G --rev 'sort(all(), "topo")'
   @  11 default {blue} draft c_D
   |
-  | *  8 default {blue} draft c_I
+  | o  8 default {blue} draft c_I
   | |
-  | *    7 default {red} draft c_H
+  | o    7 default {red} draft c_H
   | |\
-  | | *  6 default {blue} draft c_G
+  | | o  6 default {blue} draft c_G
   | | |
-  | | *  5 default {red} draft c_F
+  | | o  5 default {red} draft c_F
   | | |
-  | | *  4 default {red} draft c_E
+  | | o  4 default {red} draft c_E
   | | |
   | x |  3 default {blue} draft c_D
   |/ /
   x /  2 default {red} draft c_C
   |/
-  | *  10 default {red} draft c_C
+  | o  10 default {red} draft c_C
   |/
   x  1 default {red} draft c_B
   |
@@ -799,25 +794,25 @@
   $ hg log -G --rev 'sort(all(), "topo")'
   @  16 default {blue} draft c_D
   |
-  | *  13 default {blue} draft c_G
+  | o  13 default {blue} draft c_G
   | |
-  | | *    12 default {red} draft c_H
+  | | o    12 default {red} draft c_H
   | | |\
-  | | | | *  8 default {blue} draft c_I
+  | | | | o  8 default {blue} draft c_I
   | | | | |
   | | +---x  7 default {red} draft c_H
   | | | |/
   | +---x  6 default {blue} draft c_G
   | | |
-  | * |  5 default {red} draft c_F
+  | o |  5 default {red} draft c_F
   | | |
-  | * |  4 default {red} draft c_E
+  | o |  4 default {red} draft c_E
   | | |
   +---x  3 default {blue} draft c_D
   | |
   x |  2 default {red} draft c_C
   |/
-  | *  15 default {red} draft c_C
+  | o  15 default {red} draft c_C
   |/
   x  1 default {red} draft c_B
   |
@@ -878,7 +873,6 @@
   $ echo zzz > Z
   $ hg add Z
   $ hg commit --amend
-  1 new orphan changesets
   $ hg status --change .
   A Z
   A ggg
@@ -921,13 +915,13 @@
   |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg export .
   # HG changeset patch
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic-tutorial.t	Sat Apr 20 03:55:11 2019 +0200
@@ -1201,7 +1201,6 @@
   s0^ add a pair of shoes (base)
 
   $ hg amend -m "Adding hammer to the shopping list"
-  2 new orphan changesets
 
 Understanding the current situation with hg log is not so easy, because
 it shows too many things:
@@ -1226,14 +1225,14 @@
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  | *  changeset:   15:bb1e6254f532
+  | o  changeset:   15:bb1e6254f532
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     Adding drill
   | |
-  | *  changeset:   14:d4f97f32f8a1
+  | o  changeset:   14:d4f97f32f8a1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-topic.t
--- a/tests/test-topic.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic.t	Sat Apr 20 03:55:11 2019 +0200
@@ -515,7 +515,7 @@
   merging alpha
   warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg revert -r narf alpha
   $ hg resolve -m alpha
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-touch.t
--- a/tests/test-touch.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-touch.t	Sat Apr 20 03:55:11 2019 +0200
@@ -32,8 +32,6 @@
   $ hg add b
   $ hg commit -m ab --amend
   $ hg up --hidden 1
-  updating to a hidden changeset [0-9a-f]{12} (re)
-  (hidden revision '*' was rewritten as: *) (glob)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (*) (glob)
   (use 'hg evolve' to update to its successor: *) (glob)
@@ -46,11 +44,10 @@
   [1] a
   reviving this changeset will create divergence unless you make a duplicate.
   (a)llow divergence or (d)uplicate the changeset?  a
-  2 new content-divergent changesets
   $ hg log -G
   @  3:[0-9a-f]{12} a (re)
   
-  \*  2:[0-9a-f]{12} ab (re)
+  o  2:[0-9a-f]{12} ab (re)
   
   $ hg prune 3
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -109,12 +106,11 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg touch
-  1 new orphan changesets
 
   $ hg log -G --hidden
   @  11:[0-9a-f]{12} gna1 (re)
   |
-  . \*  10:[0-9a-f]{12} move (re)
+  . o  10:[0-9a-f]{12} move (re)
   | |
   . x  9:[0-9a-f]{12} gna1 (re)
   |/
@@ -147,14 +143,12 @@
 check that the --duplicate option does not create divergence
 
   $ hg touch --duplicate 10 --hidden
-  1 new orphan changesets
 
 check that reviving a changeset with no successor does not show the prompt
 
   $ hg prune 13
   1 changesets pruned
   $ hg touch 13 --hidden --note "testing with no successor"
-  1 new orphan changesets
   $ hg obslog -r 13 --hidden
   x  [0-9a-f]{12} (.*) move (re)
        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-tutorial.t
--- a/tests/test-tutorial.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-tutorial.t	Sat Apr 20 03:55:11 2019 +0200
@@ -1211,7 +1211,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new orphan changesets
   new changesets e4e4fa805d92
   (run 'hg update' to get a working copy)
 
@@ -1219,7 +1218,7 @@
 see both version showing up in the log.
 
   $ hg log -G
-  *  e4e4fa805d92 (draft): animals
+  o  e4e4fa805d92 (draft): animals
   |
   | @  682004e81e71 (draft): bathroom stuff
   | |
@@ -1675,14 +1674,13 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at 682004e81e71
   1 changesets pruned
-  1 new orphan changesets
 
 
 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
 is neither dead or obsolete. My repository is in an unstable state again.
 
   $ hg log -G
-  *  fc41faf45288 (draft): SPAM SPAM SPAM
+  o  fc41faf45288 (draft): SPAM SPAM SPAM
   |
   x  2a2b36e14660 (draft): animals
   |
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-uncommit-interactive.t	Sat Apr 20 03:55:11 2019 +0200
@@ -607,7 +607,6 @@
   
   patching file a
   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
-  2 new orphan changesets
 
   $ hg diff
   diff -r 676366511f95 a
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-uncommit.t
--- a/tests/test-uncommit.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-uncommit.t	Sat Apr 20 03:55:11 2019 +0200
@@ -238,15 +238,12 @@
 Test phase is preserved, no local changes
 
   $ hg up -C 3 --hidden
-  updating to a hidden changeset 5eb72dbe0cb4
-  (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark touncommit-bm)
   working directory parent is obsolete! (5eb72dbe0cb4)
   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
-  2 new content-divergent changesets
   $ hg st --copies
   A e
   $ hg st --copies --change .
@@ -270,7 +267,7 @@
   $ glog --hidden
   @  5:a1d4c1ad76cc@bar(draft) touncommit
   |
-  | *  4:e8db4aa611f6@bar(draft) touncommit
+  | o  4:e8db4aa611f6@bar(draft) touncommit
   |/
   | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
   |/
@@ -287,14 +284,11 @@
 Test --all
 
   $ hg up -C 3 --hidden
-  updating to a hidden changeset 5eb72dbe0cb4
-  (hidden revision '5eb72dbe0cb4' has diverged)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (5eb72dbe0cb4)
   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
-  1 new content-divergent changesets
   $ hg st --copies
   M b
   M d
@@ -341,7 +335,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [8] touncommit
   $ hg uncommit aa
-  1 new orphan changesets
 
 Test uncommiting agains a different base
 
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-unstability-resolution-result.t	Sat Apr 20 03:55:11 2019 +0200
@@ -36,7 +36,6 @@
   (leaving bookmark changea)
   $ echo a >> a
   $ hg amend -m changea
-  1 new orphan changesets
   $ hg evolve -v --confirm
   move:[2] changea
   atop:[3] changea
@@ -84,7 +83,6 @@
   [3] changea
   $ echo 'a' > a
   $ hg amend
-  1 new orphan changesets
   $ hg evolve
   move:[4] newer a
   atop:[5] changea
@@ -148,7 +146,6 @@
 Make precursors public
 
   $ hg phase --hidden --public 1cf0aacfd363
-  1 new phase-divergent changesets
   $ glog
   @  9:99c21c89bcef@default(draft) bk:[] newer a
   |
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-unstable-orphan.t
--- a/tests/test-unstable-orphan.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-unstable-orphan.t	Sat Apr 20 03:55:11 2019 +0200
@@ -51,11 +51,10 @@
   $ hg up "desc(_b)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "bprime"
-  1 new orphan changesets
   $ hg log -G
   @  3:36050226a9b9@default(draft) bprime
   |
-  | *  2:102002290587@default(draft) add _c
+  | o  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
@@ -92,14 +91,12 @@
   created new head
   $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
   1 changesets pruned
-  1 new orphan changesets
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommits bsecondsplit1 bsecondsplit2
   created new head
   $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)"
   1 changesets pruned
-  1 new orphan changesets
   $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)"
   1 changesets pruned
   $ hg log -G
@@ -107,7 +104,7 @@
   |
   o  5:8ffdae67d696@default(draft) add bsecondsplit1
   |
-  | *  2:102002290587@default(draft) add _c
+  | o  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-userguide.t
--- a/tests/test-userguide.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-userguide.t	Sat Apr 20 03:55:11 2019 +0200
@@ -161,7 +161,6 @@
   $ hg update -q -r 3e1cb8f70c02
   $ echo 'fix fix fix fix' > file2.c
   $ hg amend -u bob -d '6 0'
-  2 new orphan changesets
   $ hg shortlog -r 'obsolete()'
   10:3e1cb8f70c02  draft  fix bug 17
   $ hg shortlog -r "orphan()"
@@ -170,9 +169,9 @@
   $ hg --hidden shortlog -G -r 171c6a79a27b::
   @  13:395cbeda3a06  draft  fix bug 17
   |
-  | *  12:dadcbba2d606  draft  feature 23
+  | o  12:dadcbba2d606  draft  feature 23
   | |
-  | *  11:debd46bb29dc  draft  cleanup
+  | o  11:debd46bb29dc  draft  cleanup
   | |
   | x  10:3e1cb8f70c02  draft  fix bug 17
   |/
@@ -212,7 +211,6 @@
 example 8: prune an older changeset (figures 8, 9)
   $ hg prune b23d06b457a8
   1 changesets pruned
-  1 new orphan changesets
   $ hg --hidden shortlog -G -r b23d06b457a8::
   @  18:ea8fafca914b  draft  more work
   |
@@ -249,7 +247,6 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new orphan changesets
   $ hg status
   M file2.c
   $ hg revert file2.c
@@ -289,7 +286,6 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new orphan changesets
   $ hg status
   M file2.c
   $ hg commit -m 'useful tweak'
@@ -298,7 +294,7 @@
   |
   o  26:2594e98553a9  draft  fix a bug
   |
-  | *  25:fbb3c6d50427  draft  new feature
+  | o  25:fbb3c6d50427  draft  new feature
   | |
   | x  24:5b31a1239ab9  draft  fix a bug
   |/
diff -r 7de160f6c7a9 -r 0eb80259f9cb tests/test-wireproto.t
--- a/tests/test-wireproto.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-wireproto.t	Sat Apr 20 03:55:11 2019 +0200
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
 
 Check we cannot use pushkey for marker exchange anymore