Mercurial > evolve
comparison tests/test-topic-stack-complex.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 | 7915aef191ff |
| children | d70db7e455dc bcd52ce0916d |
comparison
equal
deleted
inserted
replaced
| 4435:7915aef191ff | 4436:ef155f624670 |
|---|---|
| 161 $ hg stack | 161 $ hg stack |
| 162 ### topic: foo (2 heads) | 162 ### topic: foo (2 heads) |
| 163 ### target: default (branch) | 163 ### target: default (branch) |
| 164 s5$ Added e and f (content divergent) | 164 s5$ Added e and f (content divergent) |
| 165 s3^ split2 (base) | 165 s3^ split2 (base) |
| 166 s4$ Added e and f (content divergent current) | 166 s4@ Added e and f (content divergent current) |
| 167 s3: split2 | 167 s3: split2 |
| 168 s2: split1 | 168 s2: split1 |
| 169 s1: Added a and b | 169 s1: Added a and b |
| 170 s0^ Added foo (base) | 170 s0^ Added foo (base) |
| 171 | 171 |