diff -r d5adce52cef4 -r 98941c28f3e2 tests/test-topic-stack-complex.t --- a/tests/test-topic-stack-complex.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-topic-stack-complex.t Wed Mar 21 16:18:31 2018 +0100 @@ -32,10 +32,10 @@ $ echo f > f $ hg ci -Aqm "Added e and f" $ hg show work - @ f1d3 (foo) Added e and f - o 8e82 (foo) Added c and d - o 002b (foo) Added a and b - o f360 Added foo + @ f1d36 (foo) Added e and f + o 8e825 (foo) Added c and d + o 002b8 (foo) Added a and b + o f3603 Added foo Testing in case of split within the topic @@ -92,13 +92,13 @@ t0^ Added foo (base) $ hg show work - @ 5cce (foo) split2 - o f26c (foo) split1 - | o f1d3 (foo) Added e and f - | x 8e82 (foo) Added c and d + @ 5ccee (foo) split2 + o f26c1 (foo) split1 + | o f1d36 (foo) Added e and f + | x 8e825 (foo) Added c and d |/ - o 002b (foo) Added a and b - o f360 Added foo + o 002b8 (foo) Added a and b + o f3603 Added foo $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -113,17 +113,17 @@ +foo $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg show work - @ 7d94 (foo) split1 - | o 5cce (foo) split2 - | x f26c (foo) split1 + @ 7d944 (foo) split1 + | o 5ccee (foo) split2 + | x f26c1 (foo) split1 |/ - | o f1d3 (foo) Added e and f - | x 8e82 (foo) Added c and d + | o f1d36 (foo) Added e and f + | x 8e825 (foo) Added c and d |/ - o 002b (foo) Added a and b - o f360 Added foo + o 002b8 (foo) Added a and b + o f3603 Added foo $ hg stack ### topic: foo (2 heads)