comparison tests/test-topic-push-concurrent-on.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 f7129e3d5a38
children 537fd9a86c06 cbfd36046969
comparison
equal deleted inserted replaced
3768:482195001997 3769:1bc4b0807c37
134 marked working directory as topic: babar 134 marked working directory as topic: babar
135 $ echo aaa > ddd 135 $ echo aaa > ddd
136 $ hg add ddd 136 $ hg add ddd
137 $ hg commit -m 'CD' 137 $ hg commit -m 'CD'
138 active topic 'babar' grew its first changeset 138 active topic 'babar' grew its first changeset
139 (see 'hg help topics' for more information)
139 $ hg log -G # keep track of phase because I saw some strange bug during developement 140 $ hg log -G # keep track of phase because I saw some strange bug during developement
140 @ 4 default babar draft CD 141 @ 4 default babar draft CD
141 | 142 |
142 | o 3 mountain public CC 143 | o 3 mountain public CC
143 |/ 144 |/
192 marked working directory as topic: celeste 193 marked working directory as topic: celeste
193 $ echo aaa > eee 194 $ echo aaa > eee
194 $ hg add eee 195 $ hg add eee
195 $ hg commit -m 'CE' 196 $ hg commit -m 'CE'
196 active topic 'celeste' grew its first changeset 197 active topic 'celeste' grew its first changeset
198 (see 'hg help topics' for more information)
197 $ hg log -G # keep track of phase because I saw some strange bug during developement 199 $ hg log -G # keep track of phase because I saw some strange bug during developement
198 @ 5 default celeste draft CE 200 @ 5 default celeste draft CE
199 | 201 |
200 | o 4 default babar draft CD 202 | o 4 default babar draft CD
201 |/ 203 |/
387 $ hg add aaa 389 $ hg add aaa
388 $ hg topic topicA 390 $ hg topic topicA
389 marked working directory as topic: topicA 391 marked working directory as topic: topicA
390 $ hg commit -m 'CA' 392 $ hg commit -m 'CA'
391 active topic 'topicA' grew its first changeset 393 active topic 'topicA' grew its first changeset
394 (see 'hg help topics' for more information)
392 $ hg up 'desc(CBASE)' 395 $ hg up 'desc(CBASE)'
393 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 396 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
394 $ echo aaa > bbb 397 $ echo aaa > bbb
395 $ hg add bbb 398 $ hg add bbb
396 $ hg topic topicB 399 $ hg topic topicB
397 marked working directory as topic: topicB 400 marked working directory as topic: topicB
398 $ hg commit -m 'CB' 401 $ hg commit -m 'CB'
399 active topic 'topicB' grew its first changeset 402 active topic 'topicB' grew its first changeset
403 (see 'hg help topics' for more information)
400 $ cd .. 404 $ cd ..
401 $ hg push -R repoA repoB 405 $ hg push -R repoA repoB
402 pushing to repoB 406 pushing to repoB
403 searching for changes 407 searching for changes
404 adding changesets 408 adding changesets