diff tests/test-topic-flow-publish-flag.t @ 3914:96945ea908df stable

branching: merge default into stable

The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.

--- a/tests/test-topic-flow-publish-flag.t	Wed Jul 25 15:30:37 2018 -0700
+++ b/tests/test-topic-flow-publish-flag.t	Tue Jul 31 12:52:06 2018 +0200
@@ -291,6 +291,7 @@
   marked working directory as topic: topic_A
   $ mkcommit c_dK0
   active topic 'topic_A' grew its first changeset
+  (see 'hg help topics' for more information)
   $ hg push -r 'desc("c_dK0")' --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes
@@ -299,6 +300,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   active topic 'topic_A' is now empty
+  (use 'hg topic --clear' to clear it if needed)
   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
   @  11:d06fc4f891e8 c_dK0 public default
   |
@@ -331,6 +333,7 @@
   $ hg topic topic_A
   $ mkcommit c_dL0
   active topic 'topic_A' grew its first changeset
+  (see 'hg help topics' for more information)
   $ hg push -r 'desc("c_dL0")'
   pushing to $TESTTMP/bare-branch-server
   searching for changes
@@ -387,6 +390,7 @@
   marked working directory as topic: topic_B
   $ mkcommit c_dN0
   active topic 'topic_B' grew its first changeset
+  (see 'hg help topics' for more information)
   $ hg push -r 'desc("c_dN0")' --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes