Mercurial > evolve

changeset 3359:ae6fddf39933

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update output to 9b3f95d9783d The unstable graph nodes are now shown with the character "*", update the test outputs. CORE-TEST-OUTPUT-UPDATE: 9b3f95d9783d
author Boris Feld <boris.feld@octobus.net>
date Fri, 05 Jan 2018 09:23:09 +0100
parents 81aae43ee0f1
children 1905aac253f0
files tests/test-divergent.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-evolve-order.t tests/test-evolve-split.t tests/test-evolve-templates.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-exchange-obsmarkers-case-A4.t tests/test-exchange-obsmarkers-case-B5.t tests/test-obsolete.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C4.t tests/test-sharing.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-stack-branch.t tests/test-topic-change.t tests/test-topic-debugcb.t tests/test-topic-stack-complex.t tests/test-topic-stack-data.t tests/test-topic-stack.t tests/test-topic-tutorial.t tests/test-touch.t tests/test-tutorial.t tests/test-uncommit.t tests/test-unstable.t tests/test-userguide.t
diffstat 29 files changed, 145 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-divergent.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-divergent.t	Fri Jan 05 09:23:09 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 []
   
--- a/tests/test-evolve-obshistory-complex.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Fri Jan 05 09:23:09 2018 +0100
@@ -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
@@ -250,20 +250,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 +326,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 +382,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 +410,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)
--- a/tests/test-evolve-obshistory.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-obshistory.t	Fri Jan 05 09:23:09 2018 +0100
@@ -1027,7 +1027,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
@@ -1072,7 +1072,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)
@@ -1131,7 +1131,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)
@@ -1154,7 +1154,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)
@@ -1197,7 +1197,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)
@@ -1220,7 +1220,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)
--- a/tests/test-evolve-order.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-order.t	Fri Jan 05 09:23:09 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_
   | |
--- a/tests/test-evolve-split.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-split.t	Fri Jan 05 09:23:09 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
   |/
--- a/tests/test-evolve-templates.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-templates.t	Fri Jan 05 09:23:09 2018 +0100
@@ -632,7 +632,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
@@ -663,10 +663,10 @@
 
 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 +678,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 +693,7 @@
 Precursors template should not show precursors as it's not displayed in the
 log
   $ hg tlog
-  o  019fadeab383
+  *  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -701,7 +701,7 @@
   
 
   $ hg fatelog
-  o  019fadeab383
+  *  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -709,7 +709,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 +731,7 @@
   o  ea207398892e
   
   $ hg fatelog --hidden
-  o  019fadeab383
+  *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: reworded using amend as 4:019fadeab383
@@ -745,7 +745,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"}]
   |/
--- a/tests/test-evolve-topic.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve-topic.t	Fri Jan 05 09:23:09 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)
   | |
--- a/tests/test-evolve.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-evolve.t	Fri Jan 05 09:23:09 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:edc3c9de504e@default(draft) a3
   |
-  | o  15:beb41503aa3e@default(draft) add gh
+  | *  15:beb41503aa3e@default(draft) add gh
   | |
-  | | o  14:27247fcb2df6@default(draft) add gg
+  | | *  14:27247fcb2df6@default(draft) add gg
   | |/
   | x  13:cce26b684bfe@default(draft) a3
   |/
@@ -1272,9 +1272,9 @@
   $ glog -r "edc3c9de504e::"
   @  22:8dc373be86d9@default(draft) add j1
   |
-  | o  21:d7eadcf6eccd@default(draft) add j3
+  | *  21:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:2223ea564144@default(draft) add j2
+  | *  20:2223ea564144@default(draft) add j2
   | |
   | x  19:48490698b269@default(draft) add j1
   |/
@@ -1312,9 +1312,9 @@
   $ glog -r "edc3c9de504e::"
   @  23:044804d0c10d@default(draft) add j1
   |
-  | o  21:d7eadcf6eccd@default(draft) add j3
+  | *  21:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:2223ea564144@default(draft) add j2
+  | *  20:2223ea564144@default(draft) add j2
   | |
   | x  19:48490698b269@default(draft) add j1
   |/
@@ -1446,7 +1446,7 @@
   |
   o  31:2be4d2d5bf34@default(draft) _oo
   |
-  | o  30:53f0c003e03e@default(draft) add uu
+  | *  30:53f0c003e03e@default(draft) add uu
   | |
   | x  29:1bf2152f4f82@default(draft) oo+pp
   |/
@@ -1526,7 +1526,7 @@
   |
   o  37:34ae045ec400@default(draft) amended
   |
-  | o  36:02e943732647@default(draft) will cause conflict at evolve
+  | *  36:02e943732647@default(draft) will cause conflict at evolve
   | |
   | x  35:f8e30e9317aa@default(draft) will be evolved safely
   | |
--- a/tests/test-exchange-obsmarkers-case-A4.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Fri Jan 05 09:23:09 2018 +0100
@@ -68,7 +68,7 @@
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
-  | o  06055a7959d4 (draft): B
+  | *  06055a7959d4 (draft): B
   | |
   | x  28b51eb45704 (draft): A0
   |/
--- a/tests/test-exchange-obsmarkers-case-B5.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Fri Jan 05 09:23:09 2018 +0100
@@ -80,7 +80,7 @@
   |
   @  e5ea8f9c7314 (draft): A1
   |
-  | o  1d0f3cd25300 (draft): C
+  | *  1d0f3cd25300 (draft): C
   | |
   | x  6e72f0a95b5e (draft): B0
   | |
--- a/tests/test-obsolete.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-obsolete.t	Fri Jan 05 09:23:09 2018 +0100
@@ -484,7 +484,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 +498,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 +532,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
   |
@@ -620,7 +620,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
@@ -739,7 +739,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 +759,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
--- a/tests/test-push-checkheads-partial-C2.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-push-checkheads-partial-C2.t	Fri Jan 05 09:23:09 2018 +0100
@@ -64,7 +64,7 @@
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
-  | o  d73caddc5533 (draft): B0
+  | *  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
--- a/tests/test-push-checkheads-partial-C4.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-push-checkheads-partial-C4.t	Fri Jan 05 09:23:09 2018 +0100
@@ -64,7 +64,7 @@
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
-  | o  d73caddc5533 (draft): B0
+  | *  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
--- a/tests/test-sharing.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-sharing.t	Fri Jan 05 09:23:09 2018 +0100
@@ -491,7 +491,7 @@
 
 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)
   |/
--- a/tests/test-stabilize-conflict.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-stabilize-conflict.t	Fri Jan 05 09:23:09 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
--- a/tests/test-stabilize-order.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-stabilize-order.t	Fri Jan 05 09:23:09 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
--- a/tests/test-stabilize-result.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-stabilize-result.t	Fri Jan 05 09:23:09 2018 +0100
@@ -229,7 +229,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:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
   | |
--- a/tests/test-stack-branch.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-stack-branch.t	Fri Jan 05 09:23:09 2018 +0100
@@ -112,9 +112,9 @@
   $ 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
   |/
@@ -234,9 +234,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
   |/
@@ -268,9 +268,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
   |/
--- a/tests/test-topic-change.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-change.t	Fri Jan 05 09:23:09 2018 +0100
@@ -158,16 +158,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}
@@ -377,7 +377,7 @@
   @  33:894983f69e69 {watwat}
   |  Added g  ()
   |
-  | o  32:1b83d11095b9 {movebook}
+  | *  32:1b83d11095b9 {movebook}
   | |  Added h  (book bookboo)
   | |
   | x  26:7c76c271395f {bar}
--- a/tests/test-topic-debugcb.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-debugcb.t	Fri Jan 05 09:23:09 2018 +0100
@@ -259,7 +259,7 @@
   $ hg log -G
   @  [9:b14d13efcfa7] E
   |    topic: foo
-  o  [8:c89ca6e70978] D
+  *  [8:c89ca6e70978] D
   |    topic: foo
   | o  [7:a3ea0dfe6a10] C
   | |    topic: bar
--- a/tests/test-topic-stack-complex.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-stack-complex.t	Fri Jan 05 09:23:09 2018 +0100
@@ -94,7 +94,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 +116,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
--- a/tests/test-topic-stack-data.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-stack-data.t	Fri Jan 05 09:23:09 2018 +0100
@@ -120,7 +120,7 @@
   |
   | o  bar1_d (default) []
   | |
-  | | o  add bar_e (default) []
+  | | *  add bar_e (default) []
   | | |
   | | x  add bar_d (default) []
   | |/
@@ -132,9 +132,9 @@
   | |
   | | o  fuz1_a (default) []
   | | |
-  | | | o  add fuz_c (default) []
+  | | | *  add fuz_c (default) []
   | | | |
-  | | | o  add fuz_b (default) []
+  | | | *  add fuz_b (default) []
   | | | |
   | | | x  add fuz_a (default) []
   | | |/
--- a/tests/test-topic-stack.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-stack.t	Fri Jan 05 09:23:09 2018 +0100
@@ -265,9 +265,9 @@
   $ 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
   |/
@@ -406,9 +406,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 +449,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
   |/
@@ -490,15 +490,15 @@
   $ 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
   |/
@@ -673,21 +673,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 +743,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
   |
--- a/tests/test-topic-tutorial.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-topic-tutorial.t	Fri Jan 05 09:23:09 2018 +0100
@@ -1209,14 +1209,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
--- a/tests/test-touch.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-touch.t	Fri Jan 05 09:23:09 2018 +0100
@@ -48,7 +48,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 +112,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)
   |/
--- a/tests/test-tutorial.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-tutorial.t	Fri Jan 05 09:23:09 2018 +0100
@@ -1221,7 +1221,7 @@
 see both version showing up in the log.
 
   $ hg log -G
-  o  bf1b0d202029 (draft): animals
+  *  bf1b0d202029 (draft): animals
   |
   | @  a44c85f957d3 (draft): bathroom stuff
   | |
@@ -1686,7 +1686,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
   |
--- a/tests/test-uncommit.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-uncommit.t	Fri Jan 05 09:23:09 2018 +0100
@@ -268,7 +268,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
   |/
--- a/tests/test-unstable.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-unstable.t	Fri Jan 05 09:23:09 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
   |/
--- a/tests/test-userguide.t	Thu Dec 21 06:12:02 2017 +0100
+++ b/tests/test-userguide.t	Fri Jan 05 09:23:09 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
   |/