Mercurial > evolve
diff tests/test-topic-mode.t @ 3769:1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
This is an attempt at avoiding "mistakes" by new users of topics when
they pull a topic and publish its changesets while being checked out. In
this case, the topic will become empty but still be active; however, if
this is a "foreign" topic, the user will not likely want to keep it
active for the next commit operation. So we add a hint message pointing
at general help of "topics" command so that they can eventually do
something and learn about "hg topics --clear".
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Wed, 23 May 2018 11:37:37 +0200 |
parents | f06c86fd2ffd |
children | eb928f5728c4 |
line wrap: on
line diff
--- a/tests/test-topic-mode.t Thu May 24 18:57:46 2018 +0200 +++ b/tests/test-topic-mode.t Wed May 23 11:37:37 2018 +0200 @@ -108,6 +108,7 @@ marked working directory as topic: mytopic $ hg ci -m "Added a" active topic 'mytopic' grew its first changeset + (see 'hg help topics' for more information) $ hg up -r "desc('ROOT')" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -171,6 +172,7 @@ marked working directory as topic: mytopic $ hg ci -m "Added a" active topic 'mytopic' grew its first changeset + (see 'hg help topics' for more information) $ hg up -r "desc('ROOT')" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -227,6 +229,7 @@ $ hg add A $ hg commit -m "Add A" --config devel.randomseed=42 active topic 'panoramic-antelope' grew its first changeset + (see 'hg help topics' for more information) $ hg up -r "desc(ROOT)" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -235,6 +238,7 @@ $ hg add B $ hg commit -m "Add B" --config devel.randomseed=128 active topic 'various-dove' grew its first changeset + (see 'hg help topics' for more information) Test a merge too @@ -288,6 +292,7 @@ $ hg add A $ hg commit -m "Add A" --config devel.randomseed=42 active topic 'panoramic-antelope' grew its first changeset + (see 'hg help topics' for more information) $ hg up -r "desc(ROOT)" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -296,6 +301,7 @@ $ hg add B $ hg commit -m "Add B" --config devel.randomseed=128 active topic 'various-dove' grew its first changeset + (see 'hg help topics' for more information) Test a merge too @@ -328,3 +334,4 @@ (branch merge, don't forget to commit) $ hg ci -m 'merge' --config devel.randomseed=1337 active topic 'omniscient-locust' grew its first changeset + (see 'hg help topics' for more information)