--- a/tests/test-topic-stack.t Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-stack.t Fri Oct 20 17:30:20 2017 +0200
@@ -328,8 +328,8 @@
Make things linear again
$ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
- rebasing 4:0f9ac936c87d "c_e" (foo)
- rebasing 5:6559e6d93aea "c_f" (foo)
+ rebasing 4:0f9ac936c87d "c_e"
+ rebasing 5:6559e6d93aea "c_f"
$ hg log -G
o 8 default {foo} draft c_f
|
@@ -397,8 +397,8 @@
$ echo ccc > ddd
$ hg commit --amend -m 'c_D'
$ hg rebase -d . -s 'desc(c_g)'
- rebasing 9:81264ae8a36a "c_g" (foo)
- rebasing 10:fde5f5941642 "c_h" (foo)
+ rebasing 9:81264ae8a36a "c_g"
+ rebasing 10:fde5f5941642 "c_h"
$ hg log -G
o 13 default {foo} draft c_h
|
@@ -463,8 +463,8 @@
Converting into a linear chain
$ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
- rebasing 7:215bc359096a "c_e" (foo)
- rebasing 8:ec9267b3f33f "c_f" (foo)
+ rebasing 7:215bc359096a "c_e"
+ rebasing 8:ec9267b3f33f "c_f"
$ hg log -G
o 15 default {foo} draft c_f
@@ -509,16 +509,16 @@
o 0 default {} public c_a
$ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
- rebasing 15:77082e55de88 "c_f" (foo)
+ rebasing 15: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" (foo)
+ rebasing 12:0c3e8aed985d "c_g"
switching to topic foo
- rebasing 13:b9e4f3709bc5 "c_h" (foo)
- rebasing 16:4bc813530301 "c_e" (foobar)
+ rebasing 13:b9e4f3709bc5 "c_h"
+ rebasing 16:4bc813530301 "c_e"
switching to topic foobar
- rebasing 18:4406ea4be852 "c_f" (tip foo)
+ rebasing 18:4406ea4be852 "c_f" (tip)
switching to topic foo
switching to topic foobar
$ hg up
@@ -798,12 +798,12 @@
get things linear again
$ hg rebase -r t1 -d default
- rebasing 16:1d84ec948370 "c_D" (tip blue)
+ rebasing 16:1d84ec948370 "c_D" (tip)
switching to topic blue
$ hg rebase -r t2 -d t1
- rebasing 13:3ab2eedae500 "c_G" (blue)
+ rebasing 13:3ab2eedae500 "c_G"
$ hg rebase -r t3 -d t2
- rebasing 8:3bfe800e0486 "c_I" (blue)
+ rebasing 8:3bfe800e0486 "c_I"
$ hg stack
### topic: blue
### target: default (branch)