diff tests/test-evolve-phase-divergence.t @ 3933:1194c850fe2a mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:45 +0200
parents 299748f72527
children d00f0c369bc7 e541acefbaa5
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Fri Aug 03 00:52:10 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Fri Aug 03 00:19:45 2018 +0200
@@ -115,7 +115,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -284,7 +283,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -415,7 +413,6 @@
   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
@@ -437,7 +434,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -567,7 +563,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x