Mercurial > evolve
comparison tests/test-topic-stack-data.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 |
comparison
equal
deleted
inserted
replaced
| 2996:7cc79fc0e637 | 2997:a61634f52742 |
|---|---|
| 247 Also test this situation with 'hg stack' | 247 Also test this situation with 'hg stack' |
| 248 ======================================= | 248 ======================================= |
| 249 | 249 |
| 250 $ hg stack bar | 250 $ hg stack bar |
| 251 ### topic: bar (2 heads) | 251 ### topic: bar (2 heads) |
| 252 ### branch: default | 252 ### target: default (branch) |
| 253 t5: add bar_c | 253 t5: add bar_c |
| 254 t2^ add bar_b (base) | 254 t2^ add bar_b (base) |
| 255 t4$ add bar_e (unstable) | 255 t4$ add bar_e (unstable) |
| 256 t3: bar1_d | 256 t3: bar1_d |
| 257 t2: add bar_b | 257 t2: add bar_b |
| 258 t1: add bar_a | 258 t1: add bar_a |
| 259 t0^ add base_e (base) | 259 t0^ add base_e (base) |
| 260 $ hg stack bar -v | 260 $ hg stack bar -v |
| 261 ### topic: bar (2 heads) | 261 ### topic: bar (2 heads) |
| 262 ### branch: default | 262 ### target: default (branch) |
| 263 t5(9cbadf11b44d): add bar_c | 263 t5(9cbadf11b44d): add bar_c |
| 264 t2(e555c7e8c767)^ add bar_b (base) | 264 t2(e555c7e8c767)^ add bar_b (base) |
| 265 t4(a920412b5a05)$ add bar_e (unstable) | 265 t4(a920412b5a05)$ add bar_e (unstable) |
| 266 t3(6915989374b1): bar1_d | 266 t3(6915989374b1): bar1_d |
| 267 t2(e555c7e8c767): add bar_b | 267 t2(e555c7e8c767): add bar_b |
| 268 t1(a5c2b4e00bbf): add bar_a | 268 t1(a5c2b4e00bbf): add bar_a |
| 269 t0(92f489a6251f)^ add base_e (base) | 269 t0(92f489a6251f)^ add base_e (base) |
| 270 $ hg stack baz | 270 $ hg stack baz |
| 271 ### topic: baz | 271 ### topic: baz |
| 272 ### branch: default, 2 behind | 272 ### target: default (branch), 2 behind |
| 273 t2: add baz_b | 273 t2: add baz_b |
| 274 t1: add baz_a | 274 t1: add baz_a |
| 275 t0^ add base_c (base) | 275 t0^ add base_c (base) |
| 276 $ hg stack foo | 276 $ hg stack foo |
| 277 ### topic: foo | 277 ### topic: foo |
| 278 ### branch: lake, ambigious rebase destination - branch 'lake' has 2 heads | 278 ### target: lake (branch), ambigious rebase destination - branch 'lake' has 2 heads |
| 279 t2@ add foo_b (current) | 279 t2@ add foo_b (current) |
| 280 t1: add foo_a | 280 t1: add foo_a |
| 281 t0^ add lake_a (base) | 281 t0^ add lake_a (base) |
| 282 $ hg stack fuz | 282 $ hg stack fuz |
| 283 ### topic: fuz | 283 ### topic: fuz |
| 284 ### branch: default, 1 behind | 284 ### target: default (branch), 1 behind |
| 285 t3$ add fuz_c (unstable) | 285 t3$ add fuz_c (unstable) |
| 286 t2$ add fuz_b (unstable) | 286 t2$ add fuz_b (unstable) |
| 287 t1: fuz1_a | 287 t1: fuz1_a |
| 288 t0^ add base_d (base) | 288 t0^ add base_d (base) |