Mercurial > evolve
comparison tests/test-topic-stack-data.t @ 4432:5da1d162ad50
stack: rename unstable -> orphan
That's the only instability stack can currently show, but it's about to show
more and showing "unstable" for one type of instability just isn't good.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 07 Mar 2019 19:13:45 +0800 |
parents | fb4801478d5d |
children | 3caa4a459439 |
comparison
equal
deleted
inserted
replaced
4431:f109917f5c28 | 4432:5da1d162ad50 |
---|---|
264 $ hg stack bar | 264 $ hg stack bar |
265 ### topic: bar (2 heads) | 265 ### topic: bar (2 heads) |
266 ### target: default (branch) | 266 ### target: default (branch) |
267 s5: add bar_c | 267 s5: add bar_c |
268 s2^ add bar_b (base) | 268 s2^ add bar_b (base) |
269 s4$ add bar_e (unstable) | 269 s4$ add bar_e (orphan) |
270 s3: bar1_d | 270 s3: bar1_d |
271 s2: add bar_b | 271 s2: add bar_b |
272 s1: add bar_a | 272 s1: add bar_a |
273 s0^ add base_e (base) | 273 s0^ add base_e (base) |
274 $ hg stack bar -v | 274 $ hg stack bar -v |
275 ### topic: bar (2 heads) | 275 ### topic: bar (2 heads) |
276 ### target: default (branch) | 276 ### target: default (branch) |
277 s5(9cbadf11b44d): add bar_c | 277 s5(9cbadf11b44d): add bar_c |
278 s2(e555c7e8c767)^ add bar_b (base) | 278 s2(e555c7e8c767)^ add bar_b (base) |
279 s4(a920412b5a05)$ add bar_e (unstable) | 279 s4(a920412b5a05)$ add bar_e (orphan) |
280 s3(6915989374b1): bar1_d | 280 s3(6915989374b1): bar1_d |
281 s2(e555c7e8c767): add bar_b | 281 s2(e555c7e8c767): add bar_b |
282 s1(a5c2b4e00bbf): add bar_a | 282 s1(a5c2b4e00bbf): add bar_a |
283 s0(92f489a6251f)^ add base_e (base) | 283 s0(92f489a6251f)^ add base_e (base) |
284 $ hg stack baz | 284 $ hg stack baz |
294 s1: add foo_a | 294 s1: add foo_a |
295 s0^ add lake_a (base) | 295 s0^ add lake_a (base) |
296 $ hg stack fuz | 296 $ hg stack fuz |
297 ### topic: fuz | 297 ### topic: fuz |
298 ### target: default (branch), 1 behind | 298 ### target: default (branch), 1 behind |
299 s3$ add fuz_c (unstable) | 299 s3$ add fuz_c (orphan) |
300 s2$ add fuz_b (unstable) | 300 s2$ add fuz_b (orphan) |
301 s1: fuz1_a | 301 s1: fuz1_a |
302 s0^ add base_d (base) | 302 s0^ add base_d (base) |