Mercurial > evolve

diff tests/test-topic-flow-publish-flag.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents 08c30eef85d3
children c0921b5277a0
line wrap: on
line diff
--- a/tests/test-topic-flow-publish-flag.t	Sat Apr 24 19:54:14 2021 +0800
+++ b/tests/test-topic-flow-publish-flag.t	Sat Apr 24 20:01:39 2021 +0800
@@ -394,9 +394,9 @@
   $ hg push -r 'desc("c_dN0")' --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes
-  abort: push creates new remote head 4dcd0be9db96
+  abort: push creates new remote head 4dcd0be9db96!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
   @  14:4dcd0be9db96 c_dN0 draft default topic_B
   |