diff tests/test-evolve-phase-divergence.t @ 5834:c2484b0217ee mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:49:22 +0800
parents 0f32359bcf3e
children ee54e02d3ea0
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Thu Mar 11 14:48:12 2021 +0800
+++ b/tests/test-evolve-phase-divergence.t	Thu Mar 11 14:49:22 2021 +0800
@@ -124,7 +124,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -294,7 +293,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -432,7 +430,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
@@ -454,7 +451,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -585,7 +581,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg debugobsolete
   4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}