Mercurial > evolve
comparison tests/test-topic.t @ 2997:a61634f52742
topic: try to clarify the "branch" part in stack
The idea is to clarify the meaning of "behind" with using the "target" word.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 24 Sep 2017 11:30:14 +0200 |
parents | dbc896a7a1c3 |
children | bd7e8be29542 |
comparison
equal
deleted
inserted
replaced
2996:7cc79fc0e637 | 2997:a61634f52742 |
---|---|
141 * narf | 141 * narf |
142 $ hg topics -v | 142 $ hg topics -v |
143 * narf (on branch: default, 0 changesets) | 143 * narf (on branch: default, 0 changesets) |
144 $ hg stack | 144 $ hg stack |
145 ### topic: narf | 145 ### topic: narf |
146 ### branch: default | 146 ### target: default (branch) |
147 (stack is empty) | 147 (stack is empty) |
148 t0^ Add file delta (base) | 148 t0^ Add file delta (base) |
149 | 149 |
150 Add commits to topic | 150 Add commits to topic |
151 | 151 |
880 Testing for updating to t0 | 880 Testing for updating to t0 |
881 ========================== | 881 ========================== |
882 | 882 |
883 $ hg stack | 883 $ hg stack |
884 ### topic: changewut (2 heads) | 884 ### topic: changewut (2 heads) |
885 ### branch: default, 5 behind | 885 ### target: default (branch), 5 behind |
886 t3: fran? | 886 t3: fran? |
887 t1^ start on fran (base) | 887 t1^ start on fran (base) |
888 t2@ gamma (current) | 888 t2@ gamma (current) |
889 t1: start on fran | 889 t1: start on fran |
890 t0^ Add file delta (base) | 890 t0^ Add file delta (base) |
895 | 895 |
896 $ hg topic | 896 $ hg topic |
897 * changewut | 897 * changewut |
898 $ hg stack | 898 $ hg stack |
899 ### topic: changewut (2 heads) | 899 ### topic: changewut (2 heads) |
900 ### branch: default, 5 behind | 900 ### target: default (branch), 5 behind |
901 t3: fran? | 901 t3: fran? |
902 t1^ start on fran (base) | 902 t1^ start on fran (base) |
903 t2: gamma | 903 t2: gamma |
904 t1: start on fran | 904 t1: start on fran |
905 t0^ Add file delta (base) | 905 t0^ Add file delta (base) |