Mercurial > evolve
comparison tests/test-evolve-topic.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 | d5a2cc19903f |
| children | ef155f624670 |
comparison
equal
deleted
inserted
replaced
| 4431:f109917f5c28 | 4432:5da1d162ad50 |
|---|---|
| 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 unstable) | 129 s4$ add fff (current orphan) |
| 130 s3$ add eee (unstable) | 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 |
| 135 $ hg evolve --all | 135 $ hg evolve --all |
| 263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 264 | 264 |
| 265 $ hg stack | 265 $ hg stack |
| 266 ### topic: bar | 266 ### topic: bar |
| 267 ### target: default (branch) | 267 ### target: default (branch) |
| 268 s5$ add jjj (unstable) | 268 s5$ add jjj (orphan) |
| 269 s4$ add iii (unstable) | 269 s4$ add iii (orphan) |
| 270 s3$ add hhh (unstable) | 270 s3$ add hhh (orphan) |
| 271 s2$ add ggg (current unstable) | 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 |