# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1516803629 -3600
# Node ID 4a1dc485464841adb4508703109209296d3a2af7
# Parent  b0ca70e733bfc09b6920e56c2a7d06da818d6210# Parent  8ea3eccba74612f3b4b707fccea5692d9bf0b1c3
branching: merge stable back into default

diff -r b0ca70e733bf -r 4a1dc4854648 hgext3rd/evolve/metadata.py
diff -r b0ca70e733bf -r 4a1dc4854648 hgext3rd/topic/__init__.py
diff -r b0ca70e733bf -r 4a1dc4854648 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Sat Jan 20 12:55:23 2018 +0100
+++ b/tests/test-discovery-obshashrange.t	Wed Jan 24 15:20:29 2018 +0100
@@ -213,7 +213,7 @@
   45f8b879de922f6a6e620ba04205730335b6fc7e
   sending unbundle command
   bundle2-output-bundle: "HG20", 4 parts total
-  bundle2-output-part: "replycaps" 195 bytes payload
+  bundle2-output-part: "replycaps" 205 bytes payload
   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
   bundle2-output-part: "phase-heads" 24 bytes payload
   bundle2-output-part: "obsmarkers" streamed payload
@@ -352,7 +352,7 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending unbundle command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-bundle: "HG20", 4 parts total (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "replycaps" 195 bytes payload (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "replycaps" 205 bytes payload (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "phase-heads" 24 bytes payload (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "obsmarkers" streamed payload (glob)