# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1489528040 25200
# Node ID f1ffd093ef30625cb12cc8b8601c3a102123e05f
# Parent  bb665c99562ad8fdc85a7cc82dd752eb3cbffa7e# Parent  90ab79764ce466a5df036fa4c69acc94c6ccd6ca
mercurial-3.9: merge with hg-4.0 branch

We merge with the code for the future evolve 6.0.0 code to check for
compatibility.

Only minor test output change (" -> ') have been noted.

diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-evolve-serveronly.t
--- a/tests/test-evolve-serveronly.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-evolve-serveronly.t	Tue Mar 14 14:47:20 2017 -0700
@@ -10,7 +10,7 @@
   > [phases]
   > publish = False
   > [experimental]
-  > bundle2-exp=False # < Mercurial-4.0
+  > bundle2-exp=False
   > [devel]
   > legacy.exchange=bundle1
   > [extensions]
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-evolve.t
--- a/tests/test-evolve.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-evolve.t	Tue Mar 14 14:47:20 2017 -0700
@@ -1147,7 +1147,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
   $ hg fold
   hg: unknown command 'fold'
@@ -1173,7 +1173,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
 Enabling commands selectively, only fold enabled, next is still unknown
   $ cat >> $HGRCPATH <<EOF
@@ -1209,7 +1209,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
 
 Restore all of the evolution features
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-exchange-A3.t	Tue Mar 14 14:47:20 2017 -0700
@@ -181,7 +181,7 @@
   pushing to pushdest
   searching for changes
   abort: push creates new remote head e5ea8f9c7314!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ cd ..
 
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-prev-next.t	Tue Mar 14 14:47:20 2017 -0700
@@ -221,7 +221,7 @@
   $ hg amend --edit &
   $ sleep 1
   $ hg prev
-  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
+  waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
   got lock after [4-6] seconds (re)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [0] one
@@ -230,7 +230,7 @@
   $ hg amend --edit &
   $ sleep 1
   $ hg next --evolve
-  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
+  waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
   1 new unstable changesets
   got lock after [4-6] seconds (re)
   move:[2] two
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-sharing.t
--- a/tests/test-sharing.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-sharing.t	Tue Mar 14 14:47:20 2017 -0700
@@ -342,7 +342,7 @@
   searching for changes
   remote has heads on branch 'default' that are not known locally: 540ba8f317e6
   abort: push creates new remote head cbdfbd5a5db2 with bookmark 'bug15'!
-  (pull and merge or see 'hg help push' for details about pushing new heads)
+  (pull and merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg pull ../public
   pulling from ../public
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-stabilize-result.t	Tue Mar 14 14:47:20 2017 -0700
@@ -98,7 +98,7 @@
   +newer a
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"
-  abort: unresolved merge conflicts (see 'hg help resolve')
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
   $ hg resolve -m a
   (no more unresolved files)
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-topic-push.t
--- a/tests/test-topic-push.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-topic-push.t	Tue Mar 14 14:47:20 2017 -0700
@@ -66,7 +66,7 @@
   pushing to $TESTTMP/main
   searching for changes
   abort: push creates new remote head 9fe81b7f425d!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg outgoing -r 'desc(CB)' -G
   comparing with $TESTTMP/main
@@ -165,7 +165,7 @@
   pushing to $TESTTMP/main
   searching for changes
   abort: push creates new remote head 67f579af159d!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg log -G
   @  5 default babar draft CD
@@ -208,7 +208,7 @@
   pushing to ssh://user@dummy/draft
   searching for changes
   abort: push creates new remote head 84eaf32db6c3!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg log -G
   @  6 default celeste draft CE
@@ -251,7 +251,7 @@
   pushing to ssh://user@dummy/main
   searching for changes
   abort: push creates new remote head 67f579af159d!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg log -G
   @  6 default celeste draft CE
@@ -292,7 +292,7 @@
   pushing to $TESTTMP/draft
   searching for changes
   abort: push creates new remote head f0bc62a661be on branch 'default:babar'!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
 
 Multiple head on a branch merged in a topic changesets
@@ -336,7 +336,7 @@
   pushing to $TESTTMP/draft
   searching for changes
   abort: push creates new remote head 4937c4cad39e!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
 
 
diff -r 90ab79764ce4 -r f1ffd093ef30 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Tue Mar 14 14:38:10 2017 -0700
+++ b/tests/test-topic-tutorial.t	Tue Mar 14 14:47:20 2017 -0700
@@ -424,7 +424,7 @@
   pushing to $TESTTMP/server
   searching for changes
   abort: push creates new remote head 70dfa201ed73!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
 
 
@@ -440,7 +440,7 @@
   pushing to $TESTTMP/server
   searching for changes
   abort: push creates new remote head 4cd7c1591a67!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
 
 Publishing only one of them is allowed (as long as it does not create a new branch head has we just saw in the previous case)::