diff tests/test-evolve-serveronly-bundle2.t @ 3013:945a0989e41b

packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children 8feb2cae7eae
line wrap: on
line diff
--- a/tests/test-evolve-serveronly-bundle2.t	Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Wed Sep 27 16:26:30 2017 +0200
@@ -107,7 +107,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: 2 new obsolescence markers
+  remote: 1 new obsolescence markers
   remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
@@ -127,7 +127,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  2 new obsolescence markers
+  1 new obsolescence markers
   obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ cat ../errors.log