diff -r 81aae43ee0f1 -r ae6fddf39933 tests/test-evolve.t --- 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 | |