Mercurial > evolve
diff tests/test-topic-stack.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 | e4fc3af2d0a9 0d05dcb8dd37 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Sat Mar 09 13:13:53 2019 +0800 +++ b/tests/test-topic-stack.t Sun Mar 10 18:50:00 2019 +0800 @@ -342,7 +342,7 @@ ### topic: foo ### target: default (branch) s4$ c_f (orphan) - s3$ c_e (current orphan) + s3@ c_e (current orphan) s2: c_d s1: c_c s0^ c_b (base) @@ -350,7 +350,7 @@ [topic.stack.summary.topic|### topic: [topic.active|foo]] [topic.stack.summary.branches|### target: default (branch)] [topic.stack.index topic.stack.index.orphan|s4][topic.stack.state topic.stack.state.orphan|$] [topic.stack.desc topic.stack.desc.orphan|c_f][topic.stack.state topic.stack.state.orphan| (orphan)] - [topic.stack.index topic.stack.index.current topic.stack.index.orphan|s3][topic.stack.state topic.stack.state.current topic.stack.state.orphan|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.orphan|c_e][topic.stack.state topic.stack.state.current topic.stack.state.orphan| (current orphan)] + [topic.stack.index topic.stack.index.current topic.stack.index.orphan|s3][topic.stack.state topic.stack.state.current topic.stack.state.orphan|@] [topic.stack.desc topic.stack.desc.current topic.stack.desc.orphan|c_e][topic.stack.state topic.stack.state.current topic.stack.state.orphan| (current orphan)] [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] @@ -783,7 +783,7 @@ ^ c_H s2$ c_G (orphan) ^ c_F - s1$ c_D (current orphan) + s1@ c_D (current orphan) s0^ c_C (base orphan) more obsolescence @@ -857,7 +857,7 @@ ^ c_H s2$ c_G (orphan) ^ c_F - s1$ c_D (current orphan) + s1@ c_D (current orphan) s0^ c_C (base orphan) Test stack behavior with a split