# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1516449323 -3600
# Node ID b0ca70e733bfc09b6920e56c2a7d06da818d6210
# Parent  52440d67921c6b7b773f420947c6c9a13df28d05# Parent  80894dbf98996ebc4499ef9eca2bd6dfd2578fa0
branching: merge release 7.2.1 into default

diff -r 80894dbf9899 -r b0ca70e733bf hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Sat Jan 20 12:48:26 2018 +0100
+++ b/hgext3rd/evolve/metadata.py	Sat Jan 20 12:55:23 2018 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '7.2.2.dev'
+__version__ = '7.3.0.dev'
 testedwith = '4.1.3 4.2.3 4.3.2 4.4.2'
 minimumhgversion = '4.1'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r 80894dbf9899 -r b0ca70e733bf hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Sat Jan 20 12:48:26 2018 +0100
+++ b/hgext3rd/topic/__init__.py	Sat Jan 20 12:55:23 2018 +0100
@@ -175,7 +175,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.7.1.dev'
+__version__ = '0.8.0.dev'
 
 testedwith = '4.1.3 4.2.3 4.3.3 4.4.2'
 minimumhgversion = '4.1'
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-discovery-obshashrange.t	Sat Jan 20 12:55:23 2018 +0100
@@ -178,7 +178,7 @@
   running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob)
   sending hello command
   sending between command
-  remote: 483
+  remote: 495
   remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
   remote: 1
   preparing listkeys for "phases"
@@ -213,7 +213,7 @@
   45f8b879de922f6a6e620ba04205730335b6fc7e
   sending unbundle command
   bundle2-output-bundle: "HG20", 4 parts total
-  bundle2-output-part: "replycaps" 185 bytes payload
+  bundle2-output-part: "replycaps" 195 bytes payload
   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
   bundle2-output-part: "phase-heads" 24 bytes payload
   bundle2-output-part: "obsmarkers" streamed payload
@@ -312,13 +312,57 @@
   * @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: 495 (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 (*)> 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" 195 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 80894dbf9899 -r b0ca70e733bf tests/test-divergent.t
--- a/tests/test-divergent.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-divergent.t	Sat Jan 20 12:55:23 2018 +0100
@@ -49,7 +49,7 @@
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
-  | o  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+  | *  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]
   |
-  | o  6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
+  | *  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]
   |
-  | o  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+  | *  2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Sat Jan 20 12:55:23 2018 +0100
@@ -67,8 +67,8 @@
 ------------------------
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
+  4 new orphan changesets
   2 changesets folded
-  4 new orphan changesets
   $ 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
   |
-  | o  changeset:   8:d15d0ffc75f6
+  | *  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -208,6 +208,7 @@
   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
@@ -242,6 +243,7 @@
   record this change to 'F'? [Ynesfdaq?] Y
   
   no more change to split
+  1 new orphan changesets
   $ hg log -G
   @  changeset:   15:d4a000f63ee9
   |  tag:         tip
@@ -250,20 +252,20 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  o  changeset:   14:ec31316faa9d
+  *  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | o  changeset:   13:d0f33db50670
+  | *  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     fold1
   | |
-  | o  changeset:   12:7b3290f6e0a0
+  | *  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -326,14 +328,14 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  o  changeset:   14:ec31316faa9d
+  *  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | o  changeset:   12:7b3290f6e0a0
+  | *  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -382,7 +384,7 @@
 walking algorithm works no matter the level of successors + precursors
 
   $ hg obslog 12
-  o    7b3290f6e0a0 (12) fold1
+  *    7b3290f6e0a0 (12) fold1
   |\
   x |    d15d0ffc75f6 (8) fold1
   |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
@@ -410,11 +412,11 @@
   $ hg obslog --all 15
   o  19e14c8397fc (10) fold0
   |
-  | o    7b3290f6e0a0 (12) fold1
+  | *    7b3290f6e0a0 (12) fold1
   | |\
   | | | @  d4a000f63ee9 (15) fold2
   | | | |
-  | | | | o  ec31316faa9d (14) fold2
+  | | | | *  ec31316faa9d (14) fold2
   | | | |/|
   | | | x |    100cc25b765f (9) fold2
   | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob)
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-obshistory.t	Sat Jan 20 12:55:23 2018 +0100
@@ -203,6 +203,8 @@
   (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)
@@ -303,6 +305,8 @@
   (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)
@@ -499,6 +503,8 @@
   (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)
@@ -776,6 +782,8 @@
   (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)
@@ -997,6 +1005,8 @@
   (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)
@@ -1005,6 +1015,8 @@
   (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)
@@ -1040,6 +1052,8 @@
      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)
@@ -1054,7 +1068,7 @@
   |  instability: content-divergent
   |  summary:     A2
   |
-  | o  changeset:   2:fdf9bde5129a
+  | *  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1101,7 +1115,7 @@
   $ hg obslog --hidden --all 471f378eab4c --patch
   @  65b757b745b9 (3) A2
   |
-  | o  fdf9bde5129a (2) A1
+  | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1162,7 +1176,7 @@
 Check that debugobshistory on the first diverged revision show the revision
 and the diverent one
   $ hg obslog fdf9bde5129a --patch
-  o  fdf9bde5129a (2) A1
+  *  fdf9bde5129a (2) A1
   |
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1187,7 +1201,7 @@
   $ hg obslog fdf9bde5129a -a --patch
   @  65b757b745b9 (3) A2
   |
-  | o  fdf9bde5129a (2) A1
+  | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1234,7 +1248,7 @@
   $ hg obslog 65b757b745b9 -a --patch
   @  65b757b745b9 (3) A2
   |
-  | o  fdf9bde5129a (2) A1
+  | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1259,7 +1273,7 @@
   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
   @  65b757b745b9 (3) A2
   |
-  | o  fdf9bde5129a (2) A1
+  | *  fdf9bde5129a (2) A1
   |/
   x  471f378eab4c (1) A0
        rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1334,6 +1348,8 @@
   (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)
@@ -1560,10 +1576,14 @@
   (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 80894dbf9899 -r b0ca70e733bf tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-order.t	Sat Jan 20 12:55:23 2018 +0100
@@ -48,9 +48,9 @@
   $ hg log -G
   @  4:12d519679175@default(draft) add _a
   |
-  | o  3:4d156641b718@default(draft) add _c
+  | *  3:4d156641b718@default(draft) add _c
   | |
-  | o  2:4d7242ebb004@default(draft) add _b
+  | *  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
   |
-  | o  10:a59c79776f7c@default(draft) bprime
+  | *  10:a59c79776f7c@default(draft) bprime
   | |
   | x  8:81a687b96d4d@default(draft) aprime
   |/
-  | o  7:464731bc0ed0@default(draft) add _d
+  | *  7:464731bc0ed0@default(draft) add _d
   | |
-  | o  6:52b8f9b04f83@default(draft) add _c
+  | *  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
   |
-  | o  20:507d52d715f6@default(draft) add c2prime
+  | *  20:507d52d715f6@default(draft) add c2prime
   | |
   | x  19:c995cb124ddc@default(draft) add c1prime
   |/
-  | o  18:d096a2437fd0@default(draft) add c4_
+  | *  18:d096a2437fd0@default(draft) add c4_
   | |
-  | o  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:cde95c6cba7a@default(draft) add c3_
   | |
   | x  16:e0d9f7a099fe@default(draft) add c2_
   | |
@@ -172,7 +172,7 @@
   |
   o  26:4acf61f11dfb@default(draft) add b1prime
   |
-  | o  25:594e1fbbd61f@default(draft) add b4_
+  | *  25:594e1fbbd61f@default(draft) add b4_
   | |
   | x  24:be27500cfc76@default(draft) add b3_
   | |
@@ -182,13 +182,13 @@
   |/
   | o  21:dcf786e878fd@default(draft) add c1second
   |/
-  | o  20:507d52d715f6@default(draft) add c2prime
+  | *  20:507d52d715f6@default(draft) add c2prime
   | |
   | x  19:c995cb124ddc@default(draft) add c1prime
   |/
-  | o  18:d096a2437fd0@default(draft) add c4_
+  | *  18:d096a2437fd0@default(draft) add c4_
   | |
-  | o  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:cde95c6cba7a@default(draft) add c3_
   | |
   | x  16:e0d9f7a099fe@default(draft) add c2_
   | |
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-phase.t	Sat Jan 20 12:55:23 2018 +0100
@@ -75,7 +75,7 @@
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | o  2 - 13833940840c c (secret)
+  | *  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
@@ -105,7 +105,7 @@
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | o  2 - 13833940840c c (secret)
+  | *  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve-split.t
--- a/tests/test-evolve-split.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-split.t	Sat Jan 20 12:55:23 2018 +0100
@@ -50,7 +50,7 @@
   |
   o  3:a7fdfda64c08@default(draft) _oo
   |
-  | o  2:f52200b086ca@default(draft) add uu
+  | *  2:f52200b086ca@default(draft) add uu
   | |
   | x  1:d55647aaa0c6@default(draft) oo+pp
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-templates.t	Sat Jan 20 12:55:23 2018 +0100
@@ -64,6 +64,8 @@
 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)
@@ -155,6 +157,8 @@
   
 
   $ 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)
@@ -339,6 +343,8 @@
 ---------------
 
   $ 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)
@@ -478,6 +484,8 @@
 ---------------
 
   $ 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)
@@ -503,6 +511,8 @@
   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)
@@ -618,6 +628,8 @@
      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)
@@ -632,7 +644,7 @@
   |  instability: content-divergent
   |  summary:     A2
   |
-  | o  changeset:   2:fdf9bde5129a
+  | *  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -657,16 +669,18 @@
 ---------------
 
   $ 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
-  o  019fadeab383
+  *  019fadeab383
   |    Precursors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
-  | o  fdf9bde5129a
+  | *  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   | @  471f378eab4c
@@ -678,9 +692,9 @@
   o  ea207398892e
   
   $ hg fatelog
-  o  019fadeab383
+  *  019fadeab383
   |
-  | o  fdf9bde5129a
+  | *  fdf9bde5129a
   |/
   | @  471f378eab4c
   |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
@@ -693,7 +707,7 @@
 Precursors template should not show precursors as it's not displayed in the
 log
   $ hg tlog
-  o  019fadeab383
+  *  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -701,7 +715,7 @@
   
 
   $ hg fatelog
-  o  019fadeab383
+  *  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -709,7 +723,7 @@
   
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
-  o  019fadeab383
+  *  019fadeab383
   |    Precursors: 3:65b757b745b9
   |    semi-colon: 3:65b757b745b9
   | x  65b757b745b9
@@ -731,7 +745,7 @@
   o  ea207398892e
   
   $ hg fatelog --hidden
-  o  019fadeab383
+  *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: reworded using amend as 4:019fadeab383
@@ -745,7 +759,7 @@
   
 
   $ hg fatelogjson --hidden
-  o  019fadeab383 []
+  *  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"}]
   |/
@@ -831,6 +845,8 @@
 ---------------
 
   $ 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)
@@ -854,6 +870,8 @@
   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)
@@ -886,6 +904,8 @@
   
 
   $ 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)
@@ -1143,6 +1163,7 @@
 
   $ 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)"`
@@ -1161,6 +1182,8 @@
   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)
@@ -1375,14 +1398,14 @@
   |  instability: content-divergent
   |  summary:     Add B only
   |
-  | o  changeset:   8:b18bc8331526
+  | *  changeset:   8:b18bc8331526
   |/   parent:      5:dd800401bd8c
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     Add only B
   |
-  | o  changeset:   7:ba2ed02b0c9a
+  | *  changeset:   7:ba2ed02b0c9a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan, content-divergent
@@ -1395,7 +1418,7 @@
   |    obsolete:    reworded using amend as 9:0b997eb7ceee
   |    summary:     Add A,B,C
   |
-  o  changeset:   5:dd800401bd8c
+  *  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1420,10 +1443,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | o  b18bc8331526
+  | *  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | o  ba2ed02b0c9a
+  | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
@@ -1431,7 +1454,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  o  dd800401bd8c
+  *  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1440,14 +1463,14 @@
   $ hg fatelog
   @  0b997eb7ceee
   |
-  | o  b18bc8331526
+  | *  b18bc8331526
   |/
-  | o  ba2ed02b0c9a
+  | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  o  dd800401bd8c
+  *  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1457,10 +1480,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | o  b18bc8331526
+  | *  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | o  ba2ed02b0c9a
+  | *  ba2ed02b0c9a
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
   | x  4a004186e638
@@ -1471,7 +1494,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  o  dd800401bd8c
+  *  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | x  9bd10a0775e4
@@ -1502,14 +1525,14 @@
   $ hg fatelog --hidden
   @  0b997eb7ceee
   |
-  | o  b18bc8331526
+  | *  b18bc8331526
   |/
-  | o  ba2ed02b0c9a
+  | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  o  dd800401bd8c
+  *  dd800401bd8c
   |
   | x  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -1525,22 +1548,24 @@
   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
-  o  eceed8f98ffc
+  *  eceed8f98ffc
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
-  | o  0b997eb7ceee
+  | *  0b997eb7ceee
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
-  o |  b18bc8331526
+  * |  b18bc8331526
   |/     Precursors: 4:9bd10a0775e4
   |      semi-colon: 4:9bd10a0775e4
-  o  dd800401bd8c
+  *  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | @  9bd10a0775e4
@@ -1554,13 +1579,13 @@
   o  ea207398892e
   
   $ hg fatelog
-  o  eceed8f98ffc
+  *  eceed8f98ffc
   |
-  | o  0b997eb7ceee
+  | *  0b997eb7ceee
   | |
-  o |  b18bc8331526
+  * |  b18bc8331526
   |/
-  o  dd800401bd8c
+  *  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
@@ -1588,6 +1613,8 @@
 ------------
 
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve-topic.t	Sat Jan 20 12:55:23 2018 +0100
@@ -98,17 +98,17 @@
   |
   | o  10 - {foo} d9cacd156ffc add ddd (draft)
   | |
-  | | o  9 - {bar} 1d964213b023 add jjj (draft)
+  | | *  9 - {bar} 1d964213b023 add jjj (draft)
   | | |
-  | | o  8 - {bar} fcab990f3261 add iii (draft)
+  | | *  8 - {bar} fcab990f3261 add iii (draft)
   | | |
-  | | o  7 - {bar} b0c2554835ac add hhh (draft)
+  | | *  7 - {bar} b0c2554835ac add hhh (draft)
   | | |
-  | | o  6 - {bar} c748293f1c1a add ggg (draft)
+  | | *  6 - {bar} c748293f1c1a add ggg (draft)
   | | |
   +---x  5 - {foo} 6a6b7365c751 add fff (draft)
   | |
-  o |  4 - {foo} 3969ab847d9c add eee (draft)
+  * |  4 - {foo} 3969ab847d9c add eee (draft)
   | |
   x |  3 - {foo} 4e3a154f38c7 add ddd (draft)
   |/
@@ -134,13 +134,13 @@
   |
   o  10 - {foo} d9cacd156ffc add ddd (draft)
   |
-  | o  9 - {bar} 1d964213b023 add jjj (draft)
+  | *  9 - {bar} 1d964213b023 add jjj (draft)
   | |
-  | o  8 - {bar} fcab990f3261 add iii (draft)
+  | *  8 - {bar} fcab990f3261 add iii (draft)
   | |
-  | o  7 - {bar} b0c2554835ac add hhh (draft)
+  | *  7 - {bar} b0c2554835ac add hhh (draft)
   | |
-  | o  6 - {bar} c748293f1c1a add ggg (draft)
+  | *  6 - {bar} c748293f1c1a add ggg (draft)
   | |
   | x  5 - {foo} 6a6b7365c751 add fff (draft)
   | |
@@ -249,6 +249,7 @@
   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
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-evolve.t
--- a/tests/test-evolve.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-evolve.t	Sat Jan 20 12:55:23 2018 +0100
@@ -354,7 +354,7 @@
   $ glog --hidden
   o  4:ba0ec09b1bab@default(draft) a nifty feature
   |
-  | o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+  | *  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
   |
-  | o  9 orphan
+  | *  9 orphan
   | |
-  | o  8 orphan
+  | *  8 orphan
   | |
   | x  7
   |/
@@ -957,7 +957,7 @@
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
   o  9 [default] a1__
   |
-  | o  8 [mybranch] a3
+  | *  8 [mybranch] a3
   | |
   | @  7 [mybranch] a2
   | |
@@ -991,7 +991,7 @@
   |
   o  9:9f8b83c2e7f3@default(draft) a1__
   |
-  | o  8:777c26ca5e78@mybranch(draft) a3
+  | *  8:777c26ca5e78@mybranch(draft) a3
   | |
   | x  7:eb07e22a0e63@mybranch(draft) a2
   | |
@@ -1011,7 +1011,7 @@
   |
   @  9 [default] a1__
   |
-  | o  8 [mybranch] a3
+  | *  8 [mybranch] a3
   | |
   | x  7 [mybranch] a2
   | |
@@ -1031,7 +1031,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | o  8	: a3 - test
+  | *  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1050,7 +1050,7 @@
   |/
   o  9	testbookmark: a1__ - test
   |
-  | o  8	: a3 - test
+  | *  8	: a3 - test
   | |
   | x  7	: a2 - test
   | |
@@ -1111,9 +1111,9 @@
   $ glog
   @  16:0cf3707e8971@default(draft) a3
   |
-  | o  15:daa1ff1c7fbd@default(draft) add gh
+  | *  15:daa1ff1c7fbd@default(draft) add gh
   | |
-  | | o  14:484fb3cfa7f2@default(draft) add gg
+  | | *  14:484fb3cfa7f2@default(draft) add gg
   | |/
   | x  13:b88539ad24d7@default(draft) a3
   |/
@@ -1272,9 +1272,9 @@
   $ glog -r "0cf3707e8971::"
   @  22:274b6cd0c101@default(draft) add j1
   |
-  | o  21:89e4f7e8feb5@default(draft) add j3
+  | *  21:89e4f7e8feb5@default(draft) add j3
   | |
-  | o  20:4cd61236beca@default(draft) add j2
+  | *  20:4cd61236beca@default(draft) add j2
   | |
   | x  19:0fd8bfb02de4@default(draft) add j1
   |/
@@ -1312,9 +1312,9 @@
   $ glog -r "0cf3707e8971::"
   @  23:0ef9ff75f8e2@default(draft) add j1
   |
-  | o  21:89e4f7e8feb5@default(draft) add j3
+  | *  21:89e4f7e8feb5@default(draft) add j3
   | |
-  | o  20:4cd61236beca@default(draft) add j2
+  | *  20:4cd61236beca@default(draft) add j2
   | |
   | x  19:0fd8bfb02de4@default(draft) add j1
   |/
@@ -1446,7 +1446,7 @@
   |
   o  31:2b5a32114b3d@default(draft) _oo
   |
-  | o  30:4d122571f3b6@default(draft) add uu
+  | *  30:4d122571f3b6@default(draft) add uu
   | |
   | x  29:7da3e73df8a5@default(draft) oo+pp
   |/
@@ -1526,7 +1526,7 @@
   |
   o  37:df89d30f23e2@default(draft) amended
   |
-  | o  36:59c37c5bebd1@default(draft) will cause conflict at evolve
+  | *  36:59c37c5bebd1@default(draft) will cause conflict at evolve
   | |
   | x  35:7cc12c6c7862@default(draft) will be evolved safely
   | |
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Sat Jan 20 12:55:23 2018 +0100
@@ -74,6 +74,7 @@
   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
@@ -178,6 +179,7 @@
   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
@@ -248,6 +250,7 @@
   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'}
@@ -264,9 +267,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 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -65,10 +65,11 @@
   $ 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
   |
-  | o  06055a7959d4 (draft): B
+  | *  06055a7959d4 (draft): B
   | |
   | x  28b51eb45704 (draft): A0
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Sat Jan 20 12:55:23 2018 +0100
@@ -71,6 +71,7 @@
   $ 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
@@ -80,7 +81,7 @@
   |
   @  e5ea8f9c7314 (draft): A1
   |
-  | o  1d0f3cd25300 (draft): C
+  | *  1d0f3cd25300 (draft): C
   | |
   | x  6e72f0a95b5e (draft): B0
   | |
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-C4.t
--- a/tests/test-exchange-obsmarkers-case-C4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -67,6 +67,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Sat Jan 20 12:55:23 2018 +0100
@@ -62,6 +62,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -60,6 +60,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-issue-5720.t	Sat Jan 20 12:55:23 2018 +0100
@@ -49,7 +49,7 @@
   $ hg log -G -T "{rev}: {phase}"
   @  3: draft
   |
-  | o  2: secret
+  | *  2: secret
   | |
   | x  1: draft
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-obsolete.t	Sat Jan 20 12:55:23 2018 +0100
@@ -121,6 +121,8 @@
   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
@@ -186,6 +188,7 @@
   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
@@ -209,8 +212,8 @@
   $ hg up --hidden 3 -q
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
   $ qlog
@@ -268,8 +271,8 @@
   $ hg up --hidden -q .^ # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 6` `getid 7`
   obsoleted 1 changesets
   $ hg pull -R ../other-new .
@@ -359,8 +362,8 @@
   $ hg up --hidden .^ -q # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d''"
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
   $ cd ../other-new
@@ -425,6 +428,7 @@
   $ 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
@@ -484,7 +488,7 @@
 check rebase compat
 
   $ hg log -G  --template='{rev} - {node|short} {desc}\n'
-  o  8 - 159dfc9fa5d3 add obsol_d''
+  *  8 - 159dfc9fa5d3 add obsol_d''
   |
   | o  4 - 725c380fe99b add obsol_c'
   | |
@@ -498,7 +502,7 @@
   $ hg log -G  --template='{rev} - {node|short} {desc}\n' --hidden
   x  9 - 83b5778897ad add toto
   
-  o  8 - 159dfc9fa5d3 add obsol_d''
+  *  8 - 159dfc9fa5d3 add obsol_d''
   |
   | x  7 - 909a0fb57e5d add obsol_d'
   |/
@@ -532,9 +536,9 @@
   $ hg log -G --template='{rev} - {node|short} {desc}\n'
   @  11 - 9468a5f5d8b2 add obsol_d''
   |
-  o  10 - 2033b4e49474 add obsol_c
+  *  10 - 2033b4e49474 add obsol_c
   |
-  o  4 - 725c380fe99b add obsol_c'
+  *  4 - 725c380fe99b add obsol_c'
   |
   o  1 - 7c3bad9141dc add b
   |
@@ -553,6 +557,7 @@
   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
@@ -620,7 +625,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add f
   |
-  | o  changeset:   12:6db5e282cb91
+  | *  changeset:   12:6db5e282cb91
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -683,6 +688,7 @@
   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
@@ -701,6 +707,8 @@
   
 
   $ 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:
@@ -719,6 +727,8 @@
 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)
@@ -739,7 +749,7 @@
   |  instability: orphan
   |  summary:     add obsol_d''
   |
-  | o  changeset:   15:50f11e5e3a63
+  | *  changeset:   15:50f11e5e3a63
   | |  parent:      11:9468a5f5d8b2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -759,7 +769,7 @@
   | | |    obsolete:    amended using amend as 14:705ab2a6b72e
   | | |    summary:     add f
   | | |
-  | | | o  changeset:   12:6db5e282cb91
+  | | | *  changeset:   12:6db5e282cb91
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-partial-C2.t	Sat Jan 20 12:55:23 2018 +0100
@@ -61,10 +61,11 @@
   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
   |
-  | o  d73caddc5533 (draft): B0
+  | *  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-partial-C4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -61,10 +61,11 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
-  | o  d73caddc5533 (draft): B0
+  | *  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B2.t	Sat Jan 20 12:55:23 2018 +0100
@@ -61,6 +61,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B3.t	Sat Jan 20 12:55:23 2018 +0100
@@ -61,6 +61,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -62,6 +62,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B5.t	Sat Jan 20 12:55:23 2018 +0100
@@ -65,6 +65,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B8.t	Sat Jan 20 12:55:23 2018 +0100
@@ -68,6 +68,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A2.t	Sat Jan 20 12:55:23 2018 +0100
@@ -61,6 +61,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A3.t	Sat Jan 20 12:55:23 2018 +0100
@@ -64,6 +64,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A6.t	Sat Jan 20 12:55:23 2018 +0100
@@ -70,6 +70,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A7.t	Sat Jan 20 12:55:23 2018 +0100
@@ -70,6 +70,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D2.t	Sat Jan 20 12:55:23 2018 +0100
@@ -65,6 +65,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D3.t	Sat Jan 20 12:55:23 2018 +0100
@@ -68,6 +68,7 @@
   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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sat Jan 20 12:55:23 2018 +0100
@@ -84,6 +84,7 @@
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D5.t	Sat Jan 20 12:55:23 2018 +0100
@@ -73,6 +73,7 @@
   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
@@ -107,5 +108,6 @@
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
   obsoleted 1 changesets
+  1 new orphan changesets
 
   $ cd ../..
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-sharing.t
--- a/tests/test-sharing.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-sharing.t	Sat Jan 20 12:55:23 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::
-  o  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+  *  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   |
   | @  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-split.t
--- a/tests/test-split.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-split.t	Sat Jan 20 12:55:23 2018 +0100
@@ -203,6 +203,7 @@
   
   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 80894dbf9899 -r b0ca70e733bf tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-stabilize-conflict.t	Sat Jan 20 12:55:23 2018 +0100
@@ -142,7 +142,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | o  changeset:   4:71c18f70c34f
+  | *  changeset:   4:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
@@ -234,7 +234,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | o  changeset:   6:1836b91c6c1d
+  | *  changeset:   6:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-stabilize-order.t	Sat Jan 20 12:55:23 2018 +0100
@@ -49,9 +49,9 @@
   $ glog
   @  5:005fe5914f78@default(draft) adda
   |
-  | o  4:22619daeed78@default(draft) addb
+  | *  4:22619daeed78@default(draft) addb
   | |
-  | | o  3:7a7552255fb5@default(draft) addc
+  | | *  3:7a7552255fb5@default(draft) addc
   | | |
   | | x  2:ef23d6ef94d6@default(draft) addb
   | |/
@@ -78,7 +78,7 @@
   |
   o  5:005fe5914f78@default(draft) adda
   |
-  | o  3:7a7552255fb5@default(draft) addc
+  | *  3:7a7552255fb5@default(draft) addc
   | |
   | x  2:ef23d6ef94d6@default(draft) addb
   | |
@@ -141,7 +141,7 @@
   $ glog
   @  8:7a68bc4596ea@default(draft) addb
   |
-  | o  7:0f691739f917@default(draft) addc
+  | *  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
   |
-  | o  changeset:   11:fa68011f392e
+  | *  changeset:   11:fa68011f392e
   | |  parent:      9:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     secondambiguous
   | |
-  | | o  changeset:   10:bdc003b6eec2
+  | | *  changeset:   10:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    instability: orphan
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-stabilize-result.t	Sat Jan 20 12:55:23 2018 +0100
@@ -217,6 +217,8 @@
   $ 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)
@@ -229,7 +231,7 @@
   $ glog
   @  14:eacc9c8240fe@default(draft) bk:[] More addition
   |
-  | o  13:d2f173e25686@default(draft) bk:[] More addition
+  | *  13:d2f173e25686@default(draft) bk:[] More addition
   |/
   | o  11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   | |
@@ -325,6 +327,8 @@
 -------------------------------------------------
 
   $ 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 80894dbf9899 -r b0ca70e733bf tests/test-stack-branch.t
--- a/tests/test-stack-branch.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-stack-branch.t	Sat Jan 20 12:55:23 2018 +0100
@@ -109,12 +109,13 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
+  2 new orphan changesets
   $ hg log -G
   @  6 foo {} draft c_d
   |
-  | o  5 foo {} draft c_f
+  | *  5 foo {} draft c_f
   | |
-  | o  4 foo {} draft c_e
+  | *  4 foo {} draft c_e
   | |
   | x  3 foo {} draft c_d
   |/
@@ -225,6 +226,7 @@
   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"
@@ -235,9 +237,9 @@
   |
   @  11 foo {} draft c_D
   |
-  | o  8 foo {} draft c_f
+  | *  8 foo {} draft c_f
   | |
-  | o  7 foo {} draft c_e
+  | *  7 foo {} draft c_e
   | |
   | x  6 foo {} draft c_d
   |/
@@ -269,9 +271,9 @@
   |
   @  11 foo {} draft c_D
   |
-  | o  8 foo {} draft c_f
+  | *  8 foo {} draft c_f
   | |
-  | o  7 foo {} draft c_e
+  | *  7 foo {} draft c_e
   | |
   | x  6 foo {} draft c_d
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-change.t
--- a/tests/test-topic-change.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-change.t	Sat Jan 20 12:55:23 2018 +0100
@@ -147,6 +147,7 @@
 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}
@@ -158,16 +159,16 @@
   | @  20:c2d6b7df5dcf {foobar}
   | |  Added h  ()
   | |
-  | o  18:e7b418d79a05 {bar}
+  | *  18:e7b418d79a05 {bar}
   | |  Added g  ()
   | |
-  | o  17:82e0b14f4d9e {bar}
+  | *  17:82e0b14f4d9e {bar}
   | |  Added f  ()
   | |
-  | o  16:edc4a6b9ea60 {bar}
+  | *  16:edc4a6b9ea60 {bar}
   | |  Added e  ()
   | |
-  | o  11:1315a3808ed0 {foo}
+  | *  11:1315a3808ed0 {foo}
   | |  Added d  ()
   | |
   | x  10:1fa891977a22 {foo}
@@ -371,13 +372,14 @@
 
   $ hg topic -r . watwat
   switching to topic watwat
+  1 new orphan changesets
   changed topic on 1 changes
 
   $ hg glog
   @  33:894983f69e69 {watwat}
   |  Added g  ()
   |
-  | o  32:1b83d11095b9 {movebook}
+  | *  32:1b83d11095b9 {movebook}
   | |  Added h  (book bookboo)
   | |
   | x  26:7c76c271395f {bar}
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-debugcb.t
--- a/tests/test-topic-debugcb.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-debugcb.t	Sat Jan 20 12:55:23 2018 +0100
@@ -255,11 +255,12 @@
   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
-  o  [8:c89ca6e70978] D
+  *  [8:c89ca6e70978] D
   |    topic: foo
   | o  [7:a3ea0dfe6a10] C
   | |    topic: bar
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-stack-complex.t	Sat Jan 20 12:55:23 2018 +0100
@@ -81,6 +81,7 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   Done splitting? [yN] y
+  1 new orphan changesets
 
   $ hg stack
   ### topic: foo
@@ -94,7 +95,7 @@
   $ hg show work
   @  5cce (foo) split2
   o  f26c (foo) split1
-  | o  f1d3 (foo) Added e and f
+  | *  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
@@ -116,10 +117,10 @@
   1 new orphan changesets
   $ hg show work
   @  7d94 (foo) split1
-  | o  5cce (foo) split2
+  | *  5cce (foo) split2
   | x  f26c (foo) split1
   |/
-  | o  f1d3 (foo) Added e and f
+  | *  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-stack-data.t
--- a/tests/test-topic-stack-data.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-stack-data.t	Sat Jan 20 12:55:23 2018 +0100
@@ -73,6 +73,7 @@
   $ 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
 
@@ -91,6 +92,7 @@
   $ 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
 
@@ -121,7 +123,7 @@
   |
   | o  bar1_d (default) [bar]
   | |
-  | | o  add bar_e (default) [bar]
+  | | *  add bar_e (default) [bar]
   | | |
   | | x  add bar_d (default) [bar]
   | |/
@@ -133,9 +135,9 @@
   | |
   | | o  fuz1_a (default) [fuz]
   | | |
-  | | | o  add fuz_c (default) [fuz]
+  | | | *  add fuz_c (default) [fuz]
   | | | |
-  | | | o  add fuz_b (default) [fuz]
+  | | | *  add fuz_b (default) [fuz]
   | | | |
   | | | x  add fuz_a (default) [fuz]
   | | |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-stack.t	Sat Jan 20 12:55:23 2018 +0100
@@ -262,12 +262,13 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
+  2 new orphan changesets
   $ hg log -G
   @  6 default {foo} draft c_d
   |
-  | o  5 default {foo} draft c_f
+  | *  5 default {foo} draft c_f
   | |
-  | o  4 default {foo} draft c_e
+  | *  4 default {foo} draft c_e
   | |
   | x  3 default {foo} draft c_d
   |/
@@ -396,6 +397,7 @@
   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)
@@ -406,9 +408,9 @@
   |
   @  11 default {foo} draft c_D
   |
-  | o  8 default {foo} draft c_f
+  | *  8 default {foo} draft c_f
   | |
-  | o  7 default {foo} draft c_e
+  | *  7 default {foo} draft c_e
   | |
   | x  6 default {foo} draft c_d
   |/
@@ -449,9 +451,9 @@
   |
   @  11 default {foo} draft c_D
   |
-  | o  8 default {foo} draft c_f
+  | *  8 default {foo} draft c_f
   | |
-  | o  7 default {foo} draft c_e
+  | *  7 default {foo} draft c_e
   | |
   | x  6 default {foo} draft c_d
   |/
@@ -486,19 +488,20 @@
 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
   |
-  | o  16 default {foobar} draft c_e
+  | *  16 default {foobar} draft c_e
   | |
-  | | o  15 default {foo} draft c_f
+  | | *  15 default {foo} draft c_f
   | | |
   | | x  14 default {foo} draft c_e
   | |/
-  | o  13 default {foo} draft c_h
+  | *  13 default {foo} draft c_h
   | |
-  | o  12 default {foo} draft c_g
+  | *  12 default {foo} draft c_g
   | |
   | x  11 default {foo} draft c_D
   |/
@@ -511,6 +514,7 @@
   $ 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)
@@ -662,6 +666,7 @@
   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
@@ -673,21 +678,21 @@
   $ hg log -G --rev 'sort(all(), "topo")'
   @  11 default {blue} draft c_D
   |
-  | o  8 default {blue} draft c_I
+  | *  8 default {blue} draft c_I
   | |
-  | o    7 default {red} draft c_H
+  | *    7 default {red} draft c_H
   | |\
-  | | o  6 default {blue} draft c_G
+  | | *  6 default {blue} draft c_G
   | | |
-  | | o  5 default {red} draft c_F
+  | | *  5 default {red} draft c_F
   | | |
-  | | o  4 default {red} draft c_E
+  | | *  4 default {red} draft c_E
   | | |
   | x |  3 default {blue} draft c_D
   |/ /
   x /  2 default {red} draft c_C
   |/
-  | o  10 default {red} draft c_C
+  | *  10 default {red} draft c_C
   |/
   x  1 default {red} draft c_B
   |
@@ -743,25 +748,25 @@
   $ hg log -G --rev 'sort(all(), "topo")'
   @  16 default {blue} draft c_D
   |
-  | o  13 default {blue} draft c_G
+  | *  13 default {blue} draft c_G
   | |
-  | | o    12 default {red} draft c_H
+  | | *    12 default {red} draft c_H
   | | |\
-  | | | | o  8 default {blue} draft c_I
+  | | | | *  8 default {blue} draft c_I
   | | | | |
   | | +---x  7 default {red} draft c_H
   | | | |/
   | +---x  6 default {blue} draft c_G
   | | |
-  | o |  5 default {red} draft c_F
+  | * |  5 default {red} draft c_F
   | | |
-  | o |  4 default {red} draft c_E
+  | * |  4 default {red} draft c_E
   | | |
   +---x  3 default {blue} draft c_D
   | |
   x |  2 default {red} draft c_C
   |/
-  | o  15 default {red} draft c_C
+  | *  15 default {red} draft c_C
   |/
   x  1 default {red} draft c_B
   |
@@ -822,6 +827,7 @@
   $ echo zzz > Z
   $ hg add Z
   $ hg commit --amend
+  1 new orphan changesets
   $ hg status --change .
   A Z
   A ggg
@@ -864,13 +870,13 @@
   |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(content) as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(parent) as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(user) as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg export .
   # HG changeset patch
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic-tutorial.t	Sat Jan 20 12:55:23 2018 +0100
@@ -1223,14 +1223,14 @@
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  | o  changeset:   15:bb1e6254f532
+  | *  changeset:   15:bb1e6254f532
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     Adding drill
   | |
-  | o  changeset:   14:d4f97f32f8a1
+  | *  changeset:   14:d4f97f32f8a1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-topic.t
--- a/tests/test-topic.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-topic.t	Sat Jan 20 12:55:23 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 update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg revert -r narf alpha
   $ hg resolve -m alpha
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-touch.t
--- a/tests/test-touch.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-touch.t	Sat Jan 20 12:55:23 2018 +0100
@@ -32,6 +32,8 @@
   $ 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)
@@ -48,7 +50,7 @@
   $ hg log -G
   @  3:[0-9a-f]{12} a (re)
   
-  o  2:[0-9a-f]{12} ab (re)
+  \*  2:[0-9a-f]{12} ab (re)
   
   $ hg prune 3
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -112,7 +114,7 @@
   $ hg log -G --hidden
   @  11:[0-9a-f]{12} gna1 (re)
   |
-  . o  10:[0-9a-f]{12} move (re)
+  . \*  10:[0-9a-f]{12} move (re)
   | |
   . x  9:[0-9a-f]{12} gna1 (re)
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-tutorial.t
--- a/tests/test-tutorial.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-tutorial.t	Sat Jan 20 12:55:23 2018 +0100
@@ -1213,16 +1213,16 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  1 new orphan changesets
   new changesets bf1b0d202029
   (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
-  o  bf1b0d202029 (draft): animals
+  *  bf1b0d202029 (draft): animals
   |
   | @  a44c85f957d3 (draft): bathroom stuff
   | |
@@ -1685,7 +1685,7 @@
 is neither dead or obsolete. My repository is in an unstable state again.
 
   $ hg log -G
-  o  99f039c5ec9e (draft): SPAM SPAM SPAM
+  *  99f039c5ec9e (draft): SPAM SPAM SPAM
   |
   x  ee942144f952 (draft): animals
   |
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-uncommit.t
--- a/tests/test-uncommit.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-uncommit.t	Sat Jan 20 12:55:23 2018 +0100
@@ -238,6 +238,8 @@
 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)
@@ -268,7 +270,7 @@
   $ glog --hidden
   @  5:a1d4c1ad76cc@bar(draft) touncommit
   |
-  | o  4:e8db4aa611f6@bar(draft) touncommit
+  | *  4:e8db4aa611f6@bar(draft) touncommit
   |/
   | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
   |/
@@ -285,6 +287,8 @@
 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 80894dbf9899 -r b0ca70e733bf tests/test-unstable.t
--- a/tests/test-unstable.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-unstable.t	Sat Jan 20 12:55:23 2018 +0100
@@ -46,7 +46,7 @@
   $ hg log -G
   @  3:36050226a9b9@default(draft) bprime
   |
-  | o  2:102002290587@default(draft) add _c
+  | *  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
@@ -90,7 +90,7 @@
   $ hg log -G
   @  4:47127ea62e5f@default(draft) aprime
   |
-  | o    3:6b4280e33286@default(draft) merge
+  | *    3:6b4280e33286@default(draft) merge
   | |\
   +---o  2:474da87dd33b@default(draft) add _c
   | |
@@ -143,7 +143,7 @@
   |
   | o  4:47127ea62e5f@default(draft) aprime
   |/
-  | o    3:6b4280e33286@default(draft) merge
+  | *    3:6b4280e33286@default(draft) merge
   | |\
   +---x  2:474da87dd33b@default(draft) add _c
   | |
@@ -160,7 +160,7 @@
   |
   | o  4:47127ea62e5f@default(draft) aprime
   |/
-  | o    3:6b4280e33286@default(draft) merge
+  | *    3:6b4280e33286@default(draft) merge
   | |\
   +---x  2:474da87dd33b@default(draft) add _c
   | |
@@ -191,7 +191,7 @@
   |
   o  3:8b87864bd0f4@default(draft) add bprimesplit1
   |
-  | o  2:102002290587@default(draft) add _c
+  | *  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
@@ -245,7 +245,7 @@
   |
   o  5:8ffdae67d696@default(draft) add bsecondsplit1
   |
-  | o  2:102002290587@default(draft) add _c
+  | *  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
@@ -294,7 +294,7 @@
   |
   | o  3:8b87864bd0f4@default(draft) add bprimesplit1
   |/
-  | o  2:102002290587@default(draft) add _c
+  | *  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
@@ -308,7 +308,7 @@
   |
   | o  3:8b87864bd0f4@default(draft) add bprimesplit1
   |/
-  | o  2:102002290587@default(draft) add _c
+  | *  2:102002290587@default(draft) add _c
   | |
   | x  1:37445b16603b@default(draft) add _b
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-userguide.t
--- a/tests/test-userguide.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-userguide.t	Sat Jan 20 12:55:23 2018 +0100
@@ -170,9 +170,9 @@
   $ hg --hidden shortlog -G -r 171c6a79a27b::
   @  13:395cbeda3a06  draft  fix bug 17
   |
-  | o  12:dadcbba2d606  draft  feature 23
+  | *  12:dadcbba2d606  draft  feature 23
   | |
-  | o  11:debd46bb29dc  draft  cleanup
+  | *  11:debd46bb29dc  draft  cleanup
   | |
   | x  10:3e1cb8f70c02  draft  fix bug 17
   |/
@@ -298,7 +298,7 @@
   |
   o  26:2594e98553a9  draft  fix a bug
   |
-  | o  25:fbb3c6d50427  draft  new feature
+  | *  25:fbb3c6d50427  draft  new feature
   | |
   | x  24:5b31a1239ab9  draft  fix a bug
   |/
diff -r 80894dbf9899 -r b0ca70e733bf tests/test-wireproto.t
--- a/tests/test-wireproto.t	Sat Jan 20 12:48:26 2018 +0100
+++ b/tests/test-wireproto.t	Sat Jan 20 12:55:23 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%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)
+  _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=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