Mercurial > evolve
comparison tests/test-evolve-topic.t @ 4436:ef155f624670
stack: make @ (current) more important than $ (some sort of unstable)
Base is still ^ even if it's currently checked out.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 10 Mar 2019 18:50:00 +0800 |
| parents | 5da1d162ad50 |
| children | f54bb6eaf5e6 96ce1030d2fb |
comparison
equal
deleted
inserted
replaced
| 4435:7915aef191ff | 4436:ef155f624670 |
|---|---|
| 124 Run evolve --all | 124 Run evolve --all |
| 125 | 125 |
| 126 $ hg stack | 126 $ hg stack |
| 127 ### topic: foo | 127 ### topic: foo |
| 128 ### target: default (branch) | 128 ### target: default (branch) |
| 129 s4$ add fff (current orphan) | 129 s4@ add fff (current orphan) |
| 130 s3$ add eee (orphan) | 130 s3$ add eee (orphan) |
| 131 s2: add ddd | 131 s2: add ddd |
| 132 s1: add ccc | 132 s1: add ccc |
| 133 s0^ add bbb (base) | 133 s0^ add bbb (base) |
| 134 | 134 |
| 266 ### topic: bar | 266 ### topic: bar |
| 267 ### target: default (branch) | 267 ### target: default (branch) |
| 268 s5$ add jjj (orphan) | 268 s5$ add jjj (orphan) |
| 269 s4$ add iii (orphan) | 269 s4$ add iii (orphan) |
| 270 s3$ add hhh (orphan) | 270 s3$ add hhh (orphan) |
| 271 s2$ add ggg (current orphan) | 271 s2@ add ggg (current orphan) |
| 272 s1: add fff | 272 s1: add fff |
| 273 s0^ add eee (base) | 273 s0^ add eee (base) |
| 274 | 274 |
| 275 $ hg prev | 275 $ hg prev |
| 276 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 276 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |