Mercurial > evolve
comparison tests/test-topic-flow-publish-flag.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 | bc09dd507c41 |
children | eb928f5728c4 |
comparison
equal
deleted
inserted
replaced
3768:482195001997 | 3769:1bc4b0807c37 |
---|---|
289 | 289 |
290 $ hg topic topic_A | 290 $ hg topic topic_A |
291 marked working directory as topic: topic_A | 291 marked working directory as topic: topic_A |
292 $ mkcommit c_dK0 | 292 $ mkcommit c_dK0 |
293 active topic 'topic_A' grew its first changeset | 293 active topic 'topic_A' grew its first changeset |
294 (see 'hg help topics' for more information) | |
294 $ hg push -r 'desc("c_dK0")' --publish | 295 $ hg push -r 'desc("c_dK0")' --publish |
295 pushing to $TESTTMP/bare-branch-server | 296 pushing to $TESTTMP/bare-branch-server |
296 searching for changes | 297 searching for changes |
297 adding changesets | 298 adding changesets |
298 adding manifests | 299 adding manifests |
329 ------------------------------------------------- | 330 ------------------------------------------------- |
330 | 331 |
331 $ hg topic topic_A | 332 $ hg topic topic_A |
332 $ mkcommit c_dL0 | 333 $ mkcommit c_dL0 |
333 active topic 'topic_A' grew its first changeset | 334 active topic 'topic_A' grew its first changeset |
335 (see 'hg help topics' for more information) | |
334 $ hg push -r 'desc("c_dL0")' | 336 $ hg push -r 'desc("c_dL0")' |
335 pushing to $TESTTMP/bare-branch-server | 337 pushing to $TESTTMP/bare-branch-server |
336 searching for changes | 338 searching for changes |
337 adding changesets | 339 adding changesets |
338 adding manifests | 340 adding manifests |
385 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 387 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
386 $ hg topic topic_B | 388 $ hg topic topic_B |
387 marked working directory as topic: topic_B | 389 marked working directory as topic: topic_B |
388 $ mkcommit c_dN0 | 390 $ mkcommit c_dN0 |
389 active topic 'topic_B' grew its first changeset | 391 active topic 'topic_B' grew its first changeset |
392 (see 'hg help topics' for more information) | |
390 $ hg push -r 'desc("c_dN0")' --publish | 393 $ hg push -r 'desc("c_dN0")' --publish |
391 pushing to $TESTTMP/bare-branch-server | 394 pushing to $TESTTMP/bare-branch-server |
392 searching for changes | 395 searching for changes |
393 abort: push creates new remote head 4dcd0be9db96! | 396 abort: push creates new remote head 4dcd0be9db96! |
394 (merge or see 'hg help push' for details about pushing new heads) | 397 (merge or see 'hg help push' for details about pushing new heads) |