Mercurial > evolve
diff tests/test-topic-flow-publish-flag.t @ 5755:08c30eef85d3 mercurial-5.6
tests: back out changeset d0f73113fcc0
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 28 Jan 2021 18:57:49 +0800 |
parents | 73cb6cafc930 |
children | c0921b5277a0 |
line wrap: on
line diff
--- a/tests/test-topic-flow-publish-flag.t Thu Jan 28 18:57:48 2021 +0800 +++ b/tests/test-topic-flow-publish-flag.t Thu Jan 28 18:57:49 2021 +0800 @@ -394,7 +394,7 @@ $ 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) [255] $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'