Mercurial > evolve
comparison tests/test-topic-stack.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 | 5ddea3b8d2a4 |
children | eb928f5728c4 |
comparison
equal
deleted
inserted
replaced
3768:482195001997 | 3769:1bc4b0807c37 |
---|---|
16 marked working directory as topic: other | 16 marked working directory as topic: other |
17 $ echo aaa > aaa | 17 $ echo aaa > aaa |
18 $ hg add aaa | 18 $ hg add aaa |
19 $ hg commit -m c_a | 19 $ hg commit -m c_a |
20 active topic 'other' grew its first changeset | 20 active topic 'other' grew its first changeset |
21 (see 'hg help topics' for more information) | |
21 $ echo aaa > bbb | 22 $ echo aaa > bbb |
22 $ hg add bbb | 23 $ hg add bbb |
23 $ hg commit -m c_b | 24 $ hg commit -m c_b |
24 $ hg topic foo | 25 $ hg topic foo |
25 $ echo aaa > ccc | 26 $ echo aaa > ccc |
26 $ hg add ccc | 27 $ hg add ccc |
27 $ hg commit -m c_c | 28 $ hg commit -m c_c |
28 active topic 'foo' grew its first changeset | 29 active topic 'foo' grew its first changeset |
30 (see 'hg help topics' for more information) | |
29 $ echo aaa > ddd | 31 $ echo aaa > ddd |
30 $ hg add ddd | 32 $ hg add ddd |
31 $ hg commit -m c_d | 33 $ hg commit -m c_d |
32 $ echo aaa > eee | 34 $ echo aaa > eee |
33 $ hg add eee | 35 $ hg add eee |
580 marked working directory as topic: red | 582 marked working directory as topic: red |
581 $ echo bbb > bbb | 583 $ echo bbb > bbb |
582 $ hg commit -Am 'c_B' | 584 $ hg commit -Am 'c_B' |
583 adding bbb | 585 adding bbb |
584 active topic 'red' grew its first changeset | 586 active topic 'red' grew its first changeset |
587 (see 'hg help topics' for more information) | |
585 $ echo ccc > ccc | 588 $ echo ccc > ccc |
586 $ hg commit -Am 'c_C' | 589 $ hg commit -Am 'c_C' |
587 adding ccc | 590 adding ccc |
588 $ hg topic blue | 591 $ hg topic blue |
589 $ echo ddd > ddd | 592 $ echo ddd > ddd |
590 $ hg commit -Am 'c_D' | 593 $ hg commit -Am 'c_D' |
591 adding ddd | 594 adding ddd |
592 active topic 'blue' grew its first changeset | 595 active topic 'blue' grew its first changeset |
596 (see 'hg help topics' for more information) | |
593 $ hg up 'desc("c_B")' | 597 $ hg up 'desc("c_B")' |
594 switching to topic red | 598 switching to topic red |
595 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 599 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
596 $ echo eee > eee | 600 $ echo eee > eee |
597 $ hg commit -Am 'c_E' | 601 $ hg commit -Am 'c_E' |