Mercurial > evolve
comparison tests/test-stack-branch.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 | 3caa4a459439 |
comparison
equal
deleted
inserted
replaced
4435:7915aef191ff | 4436:ef155f624670 |
---|---|
135 $ hg up b3 | 135 $ hg up b3 |
136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
137 $ hg stack | 137 $ hg stack |
138 ### target: foo (branch) | 138 ### target: foo (branch) |
139 s4$ c_f (orphan) | 139 s4$ c_f (orphan) |
140 s3$ c_e (current orphan) | 140 s3@ c_e (current orphan) |
141 s2: c_d | 141 s2: c_d |
142 s1: c_c | 142 s1: c_c |
143 s0^ c_b (base) | 143 s0^ c_b (base) |
144 $ hg up b2 | 144 $ hg up b2 |
145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |