# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1521644777 -3600
# Node ID d5adce52cef4e776db407baecd4d41a075680bcd
# Parent  e4ac2e2c2086f977afa35e23a62f849e9305a225# Parent  7dce44b4abb6629cd1341079ef2fdb76da932f5b
test-compat: merge stable into mercurial-4.4

diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-discovery-obshashrange.t	Wed Mar 21 16:06:17 2018 +0100
@@ -314,57 +314,13 @@
   * @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)
-  * marmoute @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 (*)> preparing listkeys for "phases" (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (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)
   * @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 (*)> 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)
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-divergent.t
--- a/tests/test-divergent.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-divergent.t	Wed Mar 21 16:06:17 2018 +0100
@@ -49,7 +49,7 @@
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
-  | *  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+  | o  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
@@ -92,7 +92,7 @@
   $ hg log -G
   @  7:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
   |
-  | *  6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
+  | o  6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
   |/
   | o  4:c26f1d3baed2@default(draft) add bdivergent1 []
   |/
@@ -129,7 +129,7 @@
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
-  | *  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+  | o  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-continue.t	Wed Mar 21 16:06:17 2018 +0100
@@ -42,7 +42,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -99,7 +99,7 @@
   $ hg glog
   @  8:00a5c774cc37 added d
   |   () draft
-  | *  7:ad0a59d83efe added e
+  | o  7:ad0a59d83efe added e
   | |   () draft
   | x  6:2a4e03d422e2 added d
   |/    () draft
@@ -222,13 +222,13 @@
   $ 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
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Wed Mar 21 16:06:17 2018 +0100
@@ -67,8 +67,8 @@
 ------------------------
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
+  2 changesets folded
   4 new orphan changesets
-  2 changesets folded
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
@@ -94,7 +94,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 +208,6 @@
   record this change to 'D'? [Ynesfdaq?] Y
   
   no more change to split
-  1 new orphan changesets
   $ hg split "desc(fold2)" -d "0 0" << EOF
   > Y
   > Y
@@ -243,7 +242,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 +250,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 +326,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 +382,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 +410,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-obshistory.t	Wed Mar 21 16:06:17 2018 +0100
@@ -205,8 +205,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)
@@ -308,8 +306,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)
@@ -507,8 +503,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)
@@ -788,8 +782,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)
@@ -1013,8 +1005,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)
@@ -1023,8 +1013,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)
@@ -1060,8 +1048,6 @@
      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)
@@ -1076,7 +1062,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
@@ -1123,7 +1109,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)
@@ -1186,7 +1172,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)
@@ -1211,7 +1197,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)
@@ -1258,7 +1244,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)
@@ -1283,7 +1269,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)
@@ -1360,8 +1346,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)
@@ -1591,14 +1575,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-order.t	Wed Mar 21 16:06:17 2018 +0100
@@ -48,9 +48,9 @@
   $ 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
   |/
@@ -88,13 +88,13 @@
   $ 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
   | |
@@ -140,13 +140,13 @@
   $ 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_
   | |
@@ -172,7 +172,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_
   | |
@@ -182,13 +182,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_
   | |
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-orphan-merge.t	Wed Mar 21 16:06:17 2018 +0100
@@ -56,7 +56,7 @@
   $ 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
@@ -101,7 +101,7 @@
   $ 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 +177,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
@@ -205,7 +205,7 @@
   $ 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
@@ -262,7 +262,7 @@
   $ 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
@@ -338,13 +338,13 @@
   $ 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
@@ -406,7 +406,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
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-orphan-split.t
--- a/tests/test-evolve-orphan-split.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-orphan-split.t	Wed Mar 21 16:06:17 2018 +0100
@@ -60,14 +60,13 @@
   
   created new head
   Done splitting? [yN] y
-  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
   Done splitting? [yN] y
-  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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-phase.t	Wed Mar 21 16:06:17 2018 +0100
@@ -75,7 +75,7 @@
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | *  2 - 13833940840c c (secret)
+  | o  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
@@ -105,7 +105,7 @@
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | *  2 - 13833940840c c (secret)
+  | o  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-split.t
--- a/tests/test-evolve-split.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-split.t	Wed Mar 21 16:06:17 2018 +0100
@@ -50,7 +50,7 @@
   |
   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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-stop.t
--- a/tests/test-evolve-stop.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-stop.t	Wed Mar 21 16:06:17 2018 +0100
@@ -72,7 +72,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -117,7 +117,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -159,7 +159,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -218,13 +218,13 @@
   $ 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
@@ -259,9 +259,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
@@ -337,11 +337,11 @@
   $ 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
@@ -370,9 +370,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-templates.t	Wed Mar 21 16:06:17 2018 +0100
@@ -64,8 +64,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)
@@ -157,8 +155,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)
@@ -343,8 +339,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)
@@ -484,8 +478,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)
@@ -511,8 +503,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)
@@ -628,8 +618,6 @@
      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)
@@ -644,7 +632,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
@@ -669,18 +657,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
@@ -692,9 +678,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
@@ -707,7 +693,7 @@
 Precursors template should not show precursors as it's not displayed in the
 log
   $ hg tlog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -715,7 +701,7 @@
   
 
   $ hg fatelog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -723,7 +709,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
@@ -745,7 +731,7 @@
   o  ea207398892e
   
   $ hg fatelog --hidden
-  *  019fadeab383
+  o  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: reworded using amend as 4:019fadeab383
@@ -759,7 +745,7 @@
   
 
   $ hg fatelogjson --hidden
-  *  019fadeab383 []
+  o  019fadeab383 []
   |
   | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
   |/
@@ -845,8 +831,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)
@@ -870,8 +854,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)
@@ -904,8 +886,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)
@@ -1163,7 +1143,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)"`
@@ -1182,8 +1161,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)
@@ -1398,14 +1375,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
@@ -1418,7 +1395,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
@@ -1443,10 +1420,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
@@ -1454,7 +1431,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1463,14 +1440,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
   |
@@ -1480,10 +1457,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
@@ -1494,7 +1471,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
@@ -1525,14 +1502,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
@@ -1548,24 +1525,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
@@ -1579,13 +1554,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
@@ -1613,8 +1588,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-topic.t	Wed Mar 21 16:06:17 2018 +0100
@@ -98,17 +98,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)
   |/
@@ -134,13 +134,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)
   | |
@@ -249,7 +249,6 @@
   o  0 - {} 199cc73e9a0b add aaa (draft)
   
   $ hg topic -r 070c5573d8f9 bar
-  4 new orphan changesets
   changed topic on 1 changes
   $ hg up 16d6f664b17c
   switching to topic bar
@@ -275,13 +274,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)
   |/
@@ -311,15 +310,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)
   |
   ~
 
@@ -332,15 +331,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)
   | |
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve.t	Wed Mar 21 16:06:17 2018 +0100
@@ -354,7 +354,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)
   | |/
@@ -447,9 +447,9 @@
   $ hg log -G --template '{rev} {troubles}\n'
   @  10
   |
-  | *  9 orphan
+  | o  9 orphan
   | |
-  | *  8 orphan
+  | o  8 orphan
   | |
   | x  7
   |/
@@ -958,7 +958,7 @@
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
   o  9 [default] a1__
   |
-  | *  8 [mybranch] a3
+  | o  8 [mybranch] a3
   | |
   | @  7 [mybranch] a2
   | |
@@ -992,7 +992,7 @@
   |
   o  9:9f8b83c2e7f3@default(draft) a1__
   |
-  | *  8:777c26ca5e78@mybranch(draft) a3
+  | o  8:777c26ca5e78@mybranch(draft) a3
   | |
   | x  7:eb07e22a0e63@mybranch(draft) a2
   | |
@@ -1012,7 +1012,7 @@
   |
   @  9 [default] a1__
   |
-  | *  8 [mybranch] a3
+  | o  8 [mybranch] a3
   | |
   | x  7 [mybranch] a2
   | |
@@ -1032,7 +1032,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | *  8	: a3 - test
+  | o  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1051,7 +1051,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | *  8	: a3 - test
+  | o  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1112,9 +1112,9 @@
   $ 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
   |/
@@ -1254,8 +1254,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
@@ -1263,8 +1261,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)
@@ -1291,9 +1287,9 @@
   $ 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
   |/
@@ -1331,9 +1327,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
   |/
@@ -1465,7 +1461,7 @@
   |
   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
   |/
@@ -1545,7 +1541,7 @@
   |
   o  37:df89d30f23e2@default(draft) amended
   |
-  | *  36:59c37c5bebd1@default(draft) will cause conflict at evolve
+  | o  36:59c37c5bebd1@default(draft) will cause conflict at evolve
   | |
   | x  35:7cc12c6c7862@default(draft) will be evolved safely
   | |
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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,9 +264,9 @@
   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)
+  1 new orphan changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-C4.t
--- a/tests/test-exchange-obsmarkers-case-C4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-grab.t
--- a/tests/test-grab.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-grab.t	Wed Mar 21 16:06:17 2018 +0100
@@ -106,7 +106,6 @@
 
   $ hg grab 7c3bad9141dc
   grabbing 1:7c3bad9141dc "add b"
-  1 new orphan changesets
   $ hg glog
   @  5:7c15c05db6fa add b
   |
@@ -114,7 +113,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -135,7 +134,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -219,11 +218,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 grab -r 7c15c05db6fa
   grabbing 5:7c15c05db6fa "add b"
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-issue-5720.t	Wed Mar 21 16:06:17 2018 +0100
@@ -49,7 +49,7 @@
   $ hg log -G -T "{rev}: {phase}"
   @  3: draft
   |
-  | *  2: secret
+  | o  2: secret
   | |
   | x  1: draft
   |/
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-obsolete.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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
@@ -188,7 +186,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,8 +209,8 @@
   $ hg up --hidden 3 -q
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
+  created new head
   1 new orphan changesets
-  created new head
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
   $ qlog
@@ -271,8 +268,8 @@
   $ hg up --hidden -q .^ # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
+  created new head
   1 new orphan changesets
-  created new head
   $ hg debugobsolete `getid 6` `getid 7`
   obsoleted 1 changesets
   $ hg pull -R ../other-new .
@@ -362,8 +359,8 @@
   $ hg up --hidden .^ -q # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d''"
+  created new head
   1 new orphan changesets
-  created new head
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
   $ cd ../other-new
@@ -428,7 +425,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 bumped warning
@@ -488,7 +484,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 +498,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'
   |/
@@ -536,9 +532,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 +553,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
@@ -625,7 +620,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 +683,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 +701,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,8 +719,6 @@
 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)
@@ -749,7 +739,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 +759,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-prev-next.t	Wed Mar 21 16:06:17 2018 +0100
@@ -252,7 +252,7 @@
   |
   o  6:d7f119adc759 added b (3)
   |
-  | *  5:9df671ccd2c7 added d
+  | o  5:9df671ccd2c7 added d
   | |
   | x  3:9ad178109a19 added b (2)
   |/
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-partial-C2.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-partial-C4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B2.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B3.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B5.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B8.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A2.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A3.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A6.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A7.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D2.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D3.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D4.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D5.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-sharing.t
--- a/tests/test-sharing.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-sharing.t	Wed Mar 21 16:06:17 2018 +0100
@@ -485,13 +485,13 @@
   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)
+  2 new content-divergent changesets
 
 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 e4ac2e2c2086 -r d5adce52cef4 tests/test-split.t
--- a/tests/test-split.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-split.t	Wed Mar 21 16:06:17 2018 +0100
@@ -203,7 +203,6 @@
   
   created new head
   Done splitting? [yN] y
-  2 new orphan changesets
 
 Stop before splitting the commit completely creates a commit with all the
 remaining changes
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-stabilize-conflict.t	Wed Mar 21 16:06:17 2018 +0100
@@ -142,7 +142,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | *  changeset:   4:71c18f70c34f
+  | o  changeset:   4:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
@@ -236,7 +236,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | *  changeset:   6:1836b91c6c1d
+  | o  changeset:   6:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-stabilize-order.t	Wed Mar 21 16:06:17 2018 +0100
@@ -49,9 +49,9 @@
   $ 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 +78,7 @@
   |
   o  5:005fe5914f78@default(draft) adda
   |
-  | *  3:7a7552255fb5@default(draft) addc
+  | o  3:7a7552255fb5@default(draft) addc
   | |
   | x  2:ef23d6ef94d6@default(draft) addb
   | |
@@ -141,7 +141,7 @@
   $ glog
   @  8:7a68bc4596ea@default(draft) addb
   |
-  | *  7:0f691739f917@default(draft) addc
+  | o  7:0f691739f917@default(draft) addc
   | |
   | x  6:81b8bbcd5892@default(draft) addb
   |/
@@ -204,14 +204,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-stabilize-result.t	Wed Mar 21 16:06:17 2018 +0100
@@ -218,8 +218,6 @@
   $ echo 'babar' >> a
   $ hg amend
   $ hg up --hidden 3932c176bbaa
-  updating to a hidden changeset 3932c176bbaa
-  (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (3932c176bbaa)
   (use 'hg evolve' to update to its successor: d2f173e25686)
@@ -232,7 +230,7 @@
   $ glog
   @  14:eacc9c8240fe@default(draft) bk:[] More addition
   |
-  | *  13:d2f173e25686@default(draft) bk:[] More addition
+  | o  13:d2f173e25686@default(draft) bk:[] More addition
   |/
   | o  11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   | |
@@ -328,8 +326,6 @@
 -------------------------------------------------
 
   $ hg up --hidden 3932c176bbaa
-  updating to a hidden changeset 3932c176bbaa
-  (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (3932c176bbaa)
   (use 'hg evolve' to update to its successor: f344982e63c4)
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-stack-branch.t
--- a/tests/test-stack-branch.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-stack-branch.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-change.t
--- a/tests/test-topic-change.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-change.t	Wed Mar 21 16:06:17 2018 +0100
@@ -147,7 +147,6 @@
 Changing topic in between the stack
 
   $ hg topic -r 9::10 --current
-  5 new orphan changesets
   changed topic on 2 changes
   $ hg glog
   o  22:1b88140feefe {foobar}
@@ -159,16 +158,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}
@@ -372,14 +371,13 @@
 
   $ hg topic -r . watwat
   switching to topic watwat
-  1 new orphan changesets
   changed topic on 1 changes
 
   $ hg glog
   @  33:894983f69e69 {watwat}
   |  Added g  ()
   |
-  | *  32:1b83d11095b9 {movebook}
+  | o  32:1b83d11095b9 {movebook}
   | |  Added h  (book bookboo)
   | |
   | x  26:7c76c271395f {bar}
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-debugcb.t
--- a/tests/test-topic-debugcb.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-debugcb.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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 e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-stack-complex.t	Wed Mar 21 16:06:17 2018 +0100
@@ -81,7 +81,6 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   Done splitting? [yN] y
-  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
@@ -117,10 +116,10 @@
   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
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-stack-data.t
--- a/tests/test-topic-stack-data.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-stack-data.t	Wed Mar 21 16:06:17 2018 +0100
@@ -73,7 +73,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
 
@@ -92,7 +91,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
 
@@ -123,7 +121,7 @@
   |
   | o  bar1_d (default) [bar]
   | |
-  | | *  add bar_e (default) [bar]
+  | | o  add bar_e (default) [bar]
   | | |
   | | x  add bar_d (default) [bar]
   | |/
@@ -135,9 +133,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-stack.t	Wed Mar 21 16:06:17 2018 +0100
@@ -262,13 +262,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
   |/
@@ -397,7 +396,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)
@@ -408,9 +406,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
   |/
@@ -451,9 +449,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
   |/
@@ -488,20 +486,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 changes
   $ 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
   |/
@@ -514,7 +511,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)
@@ -666,7 +662,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
@@ -678,21 +673,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
   |
@@ -748,25 +743,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
   |
@@ -827,7 +822,6 @@
   $ echo zzz > Z
   $ hg add Z
   $ hg commit --amend
-  1 new orphan changesets
   $ hg status --change .
   A Z
   A ggg
@@ -870,13 +864,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic-tutorial.t	Wed Mar 21 16:06:17 2018 +0100
@@ -1223,14 +1223,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-topic.t
--- a/tests/test-topic.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-topic.t	Wed Mar 21 16:06:17 2018 +0100
@@ -384,7 +384,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-touch.t
--- a/tests/test-touch.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-touch.t	Wed Mar 21 16:06:17 2018 +0100
@@ -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)
@@ -50,7 +48,7 @@
   $ 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
@@ -114,7 +112,7 @@
   $ 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)
   |/
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-tutorial.t	Wed Mar 21 16:06:17 2018 +0100
@@ -1211,15 +1211,15 @@
   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)
+  1 new orphan changesets
 
 The new changeset "animal" is based on an old changeset of "bathroom". You can
 see both version showing up in the log.
 
   $ hg log -G
-  *  e4e4fa805d92 (draft): animals
+  o  e4e4fa805d92 (draft): animals
   |
   | @  682004e81e71 (draft): bathroom stuff
   | |
@@ -1682,7 +1682,7 @@
 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 e4ac2e2c2086 -r d5adce52cef4 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-uncommit.t	Wed Mar 21 16:06:17 2018 +0100
@@ -238,8 +238,6 @@
 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)
@@ -270,7 +268,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,8 +285,6 @@
 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)
diff -r e4ac2e2c2086 -r d5adce52cef4 tests/test-unstable.t
--- a/tests/test-unstable.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-unstable.t	Wed Mar 21 16:06:17 2018 +0100
@@ -46,7 +46,7 @@
   $ 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
   |/
@@ -97,7 +97,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-userguide.t
--- a/tests/test-userguide.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-userguide.t	Wed Mar 21 16:06:17 2018 +0100
@@ -170,9 +170,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
   |/
@@ -298,7 +298,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 e4ac2e2c2086 -r d5adce52cef4 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-wireproto.t	Wed Mar 21 16:06:17 2018 +0100
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon 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 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=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
 
 Check we cannot use pushkey for marker exchange anymore