diff tests/test-topic-flow-publish-bare.t @ 5237:1bb465fad209 mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 08 Apr 2020 01:16:57 +0800
parents af9f40236037
children 4cf020149c4a
line wrap: on
line diff
--- a/tests/test-topic-flow-publish-bare.t	Wed Apr 08 01:16:56 2020 +0800
+++ b/tests/test-topic-flow-publish-bare.t	Wed Apr 08 01:16:57 2020 +0800
@@ -334,12 +334,12 @@
   $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics
     ext-topics-publish=auto
     topics
-  $ hg push --config experimental.auto-publish=abort -r .
+  $ hg push --config extensions.evolve= --config experimental.auto-publish=abort -r .
   pushing to $TESTTMP/bare-branch-server
   abort: push would publish 1 changesets
   (use --publish or adjust 'experimental.auto-publish' config)
   [255]
-  $ hg push --config experimental.auto-publish=abort -r . --publish
+  $ hg push --config extensions.evolve= --config experimental.auto-publish=abort -r . --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes
   adding changesets
@@ -354,7 +354,7 @@
   $ mkcommit c_aL0
   active topic 'test-push-protection' grew its first changeset
   (see 'hg help topics' for more information)
-  $ hg push --config experimental.auto-publish=abort -r .
+  $ hg push --config extensions.evolve= --config experimental.auto-publish=abort -r .
   pushing to $TESTTMP/bare-branch-server
   searching for changes
   adding changesets