diff tests/test-evolve-phase-divergence.t @ 3914:96945ea908df stable

branching: merge default into stable

The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.

--- a/tests/test-evolve-phase-divergence.t	Wed Jul 25 15:30:37 2018 -0700
+++ b/tests/test-evolve-phase-divergence.t	Tue Jul 31 12:52:06 2018 +0200
@@ -115,6 +115,7 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
+  1 local changesets published
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -283,6 +284,7 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
+  1 local changesets published
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -413,6 +415,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets b756eb10ea73
+  1 local changesets published
   (run 'hg update' to get a working copy)
 
   $ hg push ../public
@@ -434,6 +437,7 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
+  1 local changesets published
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -563,6 +567,7 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
+  1 local changesets published
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x
@@ -787,10 +792,8 @@
   rebasing to destination parent: 8c2bb6fb44e9
   merging x
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
-  evolution failed!
-  fix conflict then run 'hg evolve --continue' or use `hg evolve --abort`
-  abort: unresolved merge conflicts (see hg help resolve)
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg diff
   diff -r 8c2bb6fb44e9 l