--- a/tests/test-topic-stack-complex.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-stack-complex.t Thu Oct 25 16:33:10 2018 +0200
@@ -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 @@
s0^ 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)
@@ -151,10 +151,10 @@
working directory parent is obsolete! (f1d3649d6a8b)
(use 'hg evolve' to update to its successor: ec94a1ed1330)
$ hg amend -d '0 1'
- 1 new orphan changesets
- 2 new content-divergent changesets
+ 1 new unstable changesets
+ 2 new divergent changesets
$ hg rebase -r . -d ec94a1ed1330~1
- rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
+ rebasing 10:eb3b16fef8ea "Added e and f" (tip)
$ hg stack
### topic: foo (2 heads)
### target: default (branch)
@@ -171,6 +171,6 @@
with: [s4] Added e and f
base: [s] Added e and f
updating to "local" side of the conflict: ec94a1ed1330
- merging "other" content-divergent changeset 'f2eff98490d2'
+ merging "other" divergent changeset 'f2eff98490d2'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 8faad6276dc6