Mercurial > evolve
comparison tests/test-stack-branch.t @ 3085:3eca2cbdc498
stack: order the adjective of changeset
The new order give more interesting result:
* base current
* base unstable
* current unstable
It seems more harmonious this way. Base seems the most core and immutable
adjective describing the element. Then current is a volatile but important one.
Finally, unstable is less information than current, so it goes last.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 14:56:03 +0200 |
| parents | 945a0989e41b |
| children | f5d472b7e800 ae6fddf39933 |
comparison
equal
deleted
inserted
replaced
| 3084:144989dabe93 | 3085:3eca2cbdc498 |
|---|---|
| 249 | 249 |
| 250 $ hg stack | 250 $ hg stack |
| 251 ### target: foo (branch) (2 heads) | 251 ### target: foo (branch) (2 heads) |
| 252 b6: c_h | 252 b6: c_h |
| 253 b5: c_g | 253 b5: c_g |
| 254 b2^ c_D (base) | 254 b2^ c_D (base current) |
| 255 b4$ c_f (unstable) | 255 b4$ c_f (unstable) |
| 256 b3$ c_e (unstable) | 256 b3$ c_e (unstable) |
| 257 b2@ c_D (current) | 257 b2@ c_D (current) |
| 258 b1: c_c | 258 b1: c_c |
| 259 b0^ c_b (base) | 259 b0^ c_b (base) |
| 283 | 283 |
| 284 $ hg stack | 284 $ hg stack |
| 285 ### target: foo (branch) (2 heads) | 285 ### target: foo (branch) (2 heads) |
| 286 b6: c_h | 286 b6: c_h |
| 287 b5: c_g | 287 b5: c_g |
| 288 b2^ c_D (base) | 288 b2^ c_D (base current) |
| 289 b4$ c_f (unstable) | 289 b4$ c_f (unstable) |
| 290 b3$ c_e (unstable) | 290 b3$ c_e (unstable) |
| 291 b2@ c_D (current) | 291 b2@ c_D (current) |
| 292 b1: c_c | 292 b1: c_c |
| 293 b0^ c_b (base) | 293 b0^ c_b (base) |
| 294 $ hg phase --public b1 | 294 $ hg phase --public b1 |
| 295 $ hg stack | 295 $ hg stack |
| 296 ### target: foo (branch) (2 heads) | 296 ### target: foo (branch) (2 heads) |
| 297 b5: c_h | 297 b5: c_h |
| 298 b4: c_g | 298 b4: c_g |
| 299 b1^ c_D (base) | 299 b1^ c_D (base current) |
| 300 b3$ c_f (unstable) | 300 b3$ c_f (unstable) |
| 301 b2$ c_e (unstable) | 301 b2$ c_e (unstable) |
| 302 b1@ c_D (current) | 302 b1@ c_D (current) |
| 303 b0^ c_c (base) | 303 b0^ c_c (base) |
| 304 | 304 |