Mercurial > evolve
diff tests/test-topic-stack.t @ 2997:a61634f52742
topic: try to clarify the "branch" part in stack
The idea is to clarify the meaning of "behind" with using the "target" word.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 24 Sep 2017 11:30:14 +0200 |
| parents | 62201935e1a7 |
| children | bd7e8be29542 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Tue Sep 26 13:01:21 2017 +0200 +++ b/tests/test-topic-stack.t Sun Sep 24 11:30:14 2017 +0200 @@ -57,7 +57,7 @@ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved $ hg topic --list ### topic: other - ### branch: default + ### target: default (branch) t2@ c_b (current) t1: c_a $ hg phase --public 'topic("other")' @@ -70,7 +70,7 @@ * other $ hg stack ### topic: other - ### branch: default + ### target: default (branch) (stack is empty) t0^ c_b (base) @@ -87,7 +87,7 @@ * foo $ hg stack ### topic: foo - ### branch: default + ### target: default (branch) t4@ c_f (current) t3: c_e t2: c_d @@ -95,7 +95,7 @@ t0^ c_b (base) $ hg stack -v ### topic: foo - ### branch: default + ### target: default (branch) t4(6559e6d93aea)@ c_f (current) t3(0f9ac936c87d): c_e t2(e629654d7050): c_d @@ -209,7 +209,7 @@ * foo $ hg stack ### topic: foo - ### branch: default + ### target: default (branch) t4@ c_f (current) t3: c_e t2: c_d @@ -219,7 +219,7 @@ * foo $ hg stack --config ui.strict=true ### topic: foo - ### branch: default + ### target: default (branch) t4@ c_f (current) t3: c_e t2: c_d @@ -230,7 +230,7 @@ $ hg topic --clear $ hg stack - ### branch: default + ### target: default (branch) (stack is empty) b0^ c_f (base) @@ -279,7 +279,7 @@ $ hg topic --list ### topic: foo - ### branch: default + ### target: default (branch) t4$ c_f (unstable) t3$ c_e (unstable) t2@ c_d (current) @@ -289,7 +289,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg topic --list ### topic: foo - ### branch: default + ### target: default (branch) t4$ c_f (unstable) t3$ c_e (current unstable) t2: c_d @@ -297,7 +297,7 @@ t0^ c_b (base) $ hg topic --list --color=debug [topic.stack.summary.topic|### topic: [topic.active|foo]] - [topic.stack.summary.branches|### branch: default] + [topic.stack.summary.branches|### target: default (branch)] [topic.stack.index topic.stack.index.unstable|t4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)] [topic.stack.index topic.stack.index.current topic.stack.index.unstable|t3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)] [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] @@ -377,7 +377,7 @@ $ hg top -l ### topic: foo (2 heads) - ### branch: default + ### target: default (branch) t6@ c_h (current) t5: c_g t2^ c_d (base) @@ -421,7 +421,7 @@ $ hg topic --list ### topic: foo (2 heads) - ### branch: default + ### target: default (branch) t6: c_h t5: c_g t2^ c_D (base) @@ -545,7 +545,7 @@ $ hg stack ### topic: foobar - ### branch: default, 3 behind + ### target: default (branch), 3 behind t2@ c_e (current) ^ c_h t1: c_D @@ -553,7 +553,7 @@ $ hg stack foo ### topic: foo - ### branch: default, ambigious rebase destination - topic 'foo' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads t4: c_f ^ c_e t3: c_h @@ -633,7 +633,7 @@ $ hg stack red ### topic: red - ### branch: default, 6 behind + ### target: default (branch), 6 behind t5: c_H ^ c_G ^ c_D @@ -645,7 +645,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads t3@ c_I (current) ^ c_H t2: c_D @@ -698,7 +698,7 @@ $ hg stack red ### topic: red - ### branch: default, ambigious rebase destination - topic 'red' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads t5$ c_H (unstable) ^ c_G ^ c_D @@ -710,7 +710,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads t3$ c_I (unstable) ^ c_H t2$ c_G (unstable) @@ -772,7 +772,7 @@ $ hg stack red ### topic: red - ### branch: default, ambigious rebase destination - topic 'red' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads t5$ c_H (unstable) ^ c_G ^ c_D @@ -784,7 +784,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads t3$ c_I (unstable) ^ c_H t2$ c_G (unstable)