diff tests/test-discovery-obshashrange.t @ 4513:d70db7e455dc mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:42:13 +0200
parents 522abf1d70b7 7a779a288793
children ef1c322c389d 3ef4980353af
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t	Thu Apr 11 22:41:41 2019 +0200
+++ b/tests/test-discovery-obshashrange.t	Thu Apr 11 22:42:13 2019 +0200
@@ -231,6 +231,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
   bundle2-input-bundle: no-transaction
   bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
   bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
@@ -238,7 +239,6 @@
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 58 bytes
-  remote: 1 new obsolescence markers
   $ hg -R ../server blackbox
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
   1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)