diff tests/test-topic-tutorial.t @ 3442:7ac98f83ae6d mercurial-4.1

test-compat: merge mercurial-4.2 into mercurial-4.1

--- a/tests/test-topic-tutorial.t	Sat Jan 20 12:38:10 2018 +0100
+++ b/tests/test-topic-tutorial.t	Sat Jan 20 12:38:11 2018 +0100
@@ -1812,8 +1812,9 @@
   $ cd client
 
 We can now share these draft changesets:
+(4.1-tests needs the --force to proceed with the test)
 
-  $ hg push ../non-publishing-server -r tools
+  $ hg push ../non-publishing-server -r tools --force
   pushing to ../non-publishing-server
   searching for changes
   adding changesets
@@ -1857,12 +1858,13 @@
   t0^ add a pair of shoes (base)
 
 We can also add new changesets and share them:
+(4.1-tests needs the --force to proceed with the test)
 
   $ echo screws >> shopping
 
   $ hg commit -A -m "Adding screws"
 
-  $ hg push ../non-publishing-server
+  $ hg push ../non-publishing-server --force
   pushing to ../non-publishing-server
   searching for changes
   adding changesets