--- a/tests/test-topic-stack.t Mon Sep 25 02:23:36 2017 +0530
+++ b/tests/test-topic-stack.t Mon Sep 25 02:29:41 2017 +0530
@@ -328,8 +328,8 @@
Make things linear again
$ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
- rebasing 4:0f9ac936c87d "c_e"
- rebasing 5:6559e6d93aea "c_f"
+ rebasing 4:0f9ac936c87d "c_e" (foo)
+ rebasing 5:6559e6d93aea "c_f" (foo)
$ 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"
- rebasing 10:fde5f5941642 "c_h"
+ rebasing 9:81264ae8a36a "c_g" (foo)
+ rebasing 10:fde5f5941642 "c_h" (foo)
$ 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"
- rebasing 8:ec9267b3f33f "c_f"
+ rebasing 7:215bc359096a "c_e" (foo)
+ rebasing 8:ec9267b3f33f "c_f" (foo)
$ 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"
+ rebasing 15:77082e55de88 "c_f" (foo)
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 12:0c3e8aed985d "c_g" (foo)
switching to topic foo
- rebasing 13:b9e4f3709bc5 "c_h"
- rebasing 16:4bc813530301 "c_e"
+ rebasing 13:b9e4f3709bc5 "c_h" (foo)
+ rebasing 16:4bc813530301 "c_e" (foobar)
switching to topic foobar
- rebasing 18:4406ea4be852 "c_f" (tip)
+ rebasing 18:4406ea4be852 "c_f" (tip foo)
switching to topic foo
switching to topic foobar
$ hg up