--- a/tests/test-topic-stack.t Fri Oct 20 16:07:40 2017 +0200
+++ b/tests/test-topic-stack.t Fri Oct 20 19:32:18 2017 +0200
@@ -263,7 +263,7 @@
$ echo bbb > ddd
$ hg commit --amend
$ hg log -G
- @ 6 default {foo} draft c_d
+ @ 7 default {foo} draft c_d
|
| o 5 default {foo} draft c_f
| |
@@ -310,7 +310,7 @@
$ hg log -r 'stack()'
2 default {foo} draft c_c
- 6 default {foo} draft c_d
+ 7 default {foo} draft c_d
4 default {foo} draft c_e
5 default {foo} draft c_f
@@ -331,11 +331,11 @@
rebasing 4:0f9ac936c87d "c_e"
rebasing 5:6559e6d93aea "c_f"
$ hg log -G
- o 8 default {foo} draft c_f
+ o 9 default {foo} draft c_f
|
- o 7 default {foo} draft c_e
+ o 8 default {foo} draft c_e
|
- @ 6 default {foo} draft c_d
+ @ 7 default {foo} draft c_d
|
o 2 default {foo} draft c_c
|
@@ -356,15 +356,15 @@
$ hg add hhh
$ hg commit -m c_h
$ hg log -G
- @ 10 default {foo} draft c_h
+ @ 11 default {foo} draft c_h
|
- o 9 default {foo} draft c_g
+ o 10 default {foo} draft c_g
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
|/
- o 6 default {foo} draft c_d
+ o 7 default {foo} draft c_d
|
o 2 default {foo} draft c_c
|
@@ -378,11 +378,11 @@
$ hg top -l
### topic: foo (2 heads)
### target: default (branch)
- t6@ c_h (current)
- t5: c_g
+ t6: c_f
+ t5: c_e
t2^ c_d (base)
- t4: c_f
- t3: c_e
+ t4@ c_h (current)
+ t3: c_g
t2: c_d
t1: c_c
t0^ c_b (base)
@@ -397,20 +397,20 @@
$ echo ccc > ddd
$ hg commit --amend -m 'c_D'
$ hg rebase -d . -s 'desc(c_g)'
- rebasing 9:81264ae8a36a "c_g"
- rebasing 10:fde5f5941642 "c_h"
+ rebasing 10:81264ae8a36a "c_g"
+ rebasing 11:fde5f5941642 "c_h"
$ hg log -G
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
| |
- | x 6 default {foo} draft c_d
+ | x 7 default {foo} draft c_d
|/
o 2 default {foo} draft c_c
|
@@ -422,11 +422,11 @@
$ hg topic --list
### topic: foo (2 heads)
### target: default (branch)
- t6: c_h
- t5: c_g
+ t6$ c_f (unstable)
+ t5$ c_e (unstable)
t2^ c_D (base current)
- t4$ c_f (unstable)
- t3$ c_e (unstable)
+ t4: c_h
+ t3: c_g
t2@ c_D (current)
t1: c_c
t0^ c_b (base)
@@ -443,17 +443,17 @@
==============================================================================
$ hg log --graph
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
| |
- | x 6 default {foo} draft c_d
+ | x 7 default {foo} draft c_d
|/
o 2 default {foo} draft c_c
|
@@ -463,19 +463,19 @@
Converting into a linear chain
$ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
- rebasing 7:215bc359096a "c_e"
- rebasing 8:ec9267b3f33f "c_f"
+ rebasing 8:215bc359096a "c_e"
+ rebasing 9:ec9267b3f33f "c_f"
$ hg log -G
- o 15 default {foo} draft c_f
+ o 17 default {foo} draft c_f
|
- o 14 default {foo} draft c_e
+ o 16 default {foo} draft c_e
|
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
o 2 default {foo} draft c_c
|
@@ -488,19 +488,19 @@
switching to topic foobar
changed topic on 2 changes
$ hg log -G
- @ 17 default {foobar} draft c_D
+ @ 19 default {foobar} draft c_D
|
- | o 16 default {foobar} draft c_e
+ | o 18 default {foobar} draft c_e
| |
- | | o 15 default {foo} draft c_f
+ | | o 17 default {foo} draft c_f
| | |
- | | x 14 default {foo} draft c_e
+ | | x 16 default {foo} draft c_e
| |/
- | o 13 default {foo} draft c_h
+ | o 15 default {foo} draft c_h
| |
- | o 12 default {foo} draft c_g
+ | o 14 default {foo} draft c_g
| |
- | x 11 default {foo} draft c_D
+ | x 13 default {foo} draft c_D
|/
o 2 default {foo} draft c_c
|
@@ -509,30 +509,30 @@
o 0 default {} public c_a
$ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
- rebasing 15:77082e55de88 "c_f"
+ rebasing 17:77082e55de88 "c_f"
switching to topic foo
switching to topic foobar
$ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
- rebasing 12:0c3e8aed985d "c_g"
+ rebasing 14:0c3e8aed985d "c_g"
switching to topic foo
- rebasing 13:b9e4f3709bc5 "c_h"
- rebasing 16:4bc813530301 "c_e"
+ rebasing 15:b9e4f3709bc5 "c_h"
+ rebasing 18:4bc813530301 "c_e"
switching to topic foobar
- rebasing 18:4406ea4be852 "c_f" (tip)
+ rebasing 20:4406ea4be852 "c_f" (tip)
switching to topic foo
switching to topic foobar
$ hg up
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
- o 22 default {foo} draft c_f
+ o 24 default {foo} draft c_f
|
- @ 21 default {foobar} draft c_e
+ @ 23 default {foobar} draft c_e
|
- o 20 default {foo} draft c_h
+ o 22 default {foo} draft c_h
|
- o 19 default {foo} draft c_g
+ o 21 default {foo} draft c_g
|
- o 17 default {foobar} draft c_D
+ o 19 default {foobar} draft c_D
|
o 2 default {foo} draft c_c
|
@@ -856,11 +856,11 @@
Done splitting? [yN] y
$ hg --config extensions.evolve= obslog --all
- o dde94df880e9 (21) c_G
+ o dde94df880e9 (22) c_G
|
- | @ e7ea874afbd5 (22) c_G
+ | @ e7ea874afbd5 (23) c_G
|/
- x b24bab30ac12 (20) c_G
+ x b24bab30ac12 (21) c_G
| rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 907f7d3c2333 (18) c_G