diff tests/test-evolve-serveronly-bundle2.t @ 3591:98941c28f3e2 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

--- a/tests/test-evolve-serveronly-bundle2.t	Wed Mar 21 16:06:17 2018 +0100
+++ b/tests/test-evolve-serveronly-bundle2.t	Wed Mar 21 16:18:31 2018 +0100
@@ -72,7 +72,6 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets 8685c6d34325:4957bfdac07e
   (run 'hg update' to get a working copy)
   $ cat ../errors.log
   $ hg push -R ../other
@@ -108,7 +107,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: 1 new obsolescence markers
+  remote: 2 new obsolescence markers
   remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
@@ -128,9 +127,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
+  2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull