diff tests/test-obsolete-push.t @ 4359:2cbb9914d227 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

--- a/tests/test-obsolete-push.t	Mon Dec 24 17:47:27 2018 +0100
+++ b/tests/test-obsolete-push.t	Tue Jan 22 12:54:43 2019 -0500
@@ -4,6 +4,7 @@
   > [extensions]
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
+  $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH
 
   $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
   $ glog() {
@@ -72,12 +73,12 @@
   $ hg push -r .
   pushing to $TESTTMP/source
   abort: push would publish 1 changesets
-  (behavior controlled by 'experimental.auto-publish' config)
+  (* 'experimental.auto-publish' config) (glob)
   [255]
   $ hg push
   pushing to $TESTTMP/source
   abort: push would publish 1 changesets
-  (behavior controlled by 'experimental.auto-publish' config)
+  (* 'experimental.auto-publish' config) (glob)
   [255]
 
 warning behavior
@@ -91,3 +92,15 @@
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 1 files
+
+--publish overrides auto-publish
+
+  $ echo d > d
+  $ hg ci -qAm D d
+  $ hg push -r . --publish --config experimental.auto-publish=abort
+  pushing to $TESTTMP/source
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files