Mercurial > evolve
diff tests/test-topic-rebase.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 | 62201935e1a7 |
| children | d12c82fd1143 |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Tue Sep 26 13:01:21 2017 +0200 +++ b/tests/test-topic-rebase.t Sun Sep 24 11:30:14 2017 +0200 @@ -45,7 +45,7 @@ active topic 'myfeature' grew its first changeset $ hg stack ### topic: myfeature - ### branch: default + ### target: default (branch) t1@ add feature1 (current) t0^ add ROOT (base) $ logtopic @@ -75,7 +75,7 @@ switching to topic myfeature $ hg stack ### topic: myfeature - ### branch: default + ### target: default (branch) t1@ add feature1 (current) t0^ add default (base) $ logtopic @@ -89,7 +89,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg stack ### topic: myfeature - ### branch: default + ### target: default (branch) t1@ add feature1 (current) t0^ add default (base) @@ -153,13 +153,13 @@ topics: $ hg stack ### topic: myotherfeature - ### branch: default + ### target: default (branch) t1@ myotherfeature1 (current) t0^ default3 (base) $ hg update --rev 7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg stack ### topic: myotherfeature - ### branch: default + ### target: default (branch) t1@ myotherfeature1 (current) t0^ default3 (base)