diff tests/test-simple4server.t @ 1518:bca3fce56b2c stable

merge with default there is some 3.6 related fix and test change that we need on default. No other significant change happened since last release expect for split, still marked experimental. So we prepare for a bugfix release.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 02 Nov 2015 00:38:18 +0000
parents 8ca31deb8db7
children 97b9141cbf72
line wrap: on
line diff
--- a/tests/test-simple4server.t	Mon Oct 12 01:22:41 2015 -0700
+++ b/tests/test-simple4server.t	Mon Nov 02 00:38:18 2015 +0000
@@ -96,7 +96,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 2 obsolescence markers (*) (glob)
+  pushing 2 obsolescence markers (* bytes) (glob)
   $ cat ../errors.log
   $ hg push
   pushing to http://localhost:$HGPORT/