diff -r 98941c28f3e2 -r 7a5c3175015e tests/test-topic-stack-complex.t --- a/tests/test-topic-stack-complex.t Wed Mar 21 16:18:31 2018 +0100 +++ b/tests/test-topic-stack-complex.t Wed Mar 21 16:32:54 2018 +0100 @@ -9,6 +9,8 @@ > evolution = all > [ui] > interactive = True + > [defaults] + > split = -d "0 "0 > [extensions] > show = > EOF @@ -32,9 +34,9 @@ $ echo f > f $ hg ci -Aqm "Added e and f" $ hg show work - @ f1d36 (foo) Added e and f - o 8e825 (foo) Added c and d - o 002b8 (foo) Added a and b + @ f1d36 Added e and f + o 8e825 Added c and d + o 002b8 Added a and b o f3603 Added foo Testing in case of split within the topic @@ -92,12 +94,12 @@ t0^ Added foo (base) $ hg show work - @ 5ccee (foo) split2 - o f26c1 (foo) split1 - | o f1d36 (foo) Added e and f - | x 8e825 (foo) Added c and d + @ 5ccee split2 + o f26c1 split1 + | o f1d36 Added e and f + | x 8e825 Added c and d |/ - o 002b8 (foo) Added a and b + o 002b8 Added a and b o f3603 Added foo $ hg prev @@ -107,7 +109,7 @@ $ hg diff diff -r f26c1b9addde c --- a/c Thu Jan 01 00:00:00 1970 +0000 - +++ b/c Thu Jan 01 00:00:00 1970 +0000 + +++ b/c * (glob) @@ -1,1 +1,1 @@ -c +foo @@ -115,14 +117,14 @@ $ hg amend 1 new unstable changesets $ hg show work - @ 7d944 (foo) split1 - | o 5ccee (foo) split2 - | x f26c1 (foo) split1 + @ 7d944 split1 + | o 5ccee split2 + | x f26c1 split1 |/ - | o f1d36 (foo) Added e and f - | x 8e825 (foo) Added c and d + | o f1d36 Added e and f + | x 8e825 Added c and d |/ - o 002b8 (foo) Added a and b + o 002b8 Added a and b o f3603 Added foo $ hg stack