# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1513464752 -3600
# Node ID 4d7e002a2bb50bd48cc327dcff8635dbd34b805b
# Parent  b834cb64f77987ba20ae7ccfb5d1d68da1113534# Parent  57aedd4c39a0430bdf1dffbec9bc5585d7f36a9d
branching: merge stable into default

diff -r b834cb64f779 -r 4d7e002a2bb5 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Thu Dec 14 00:53:55 2017 +0100
+++ b/hgext3rd/evolve/metadata.py	Sat Dec 16 23:52:32 2017 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '7.1.1.dev'
+__version__ = '7.2.0.dev'
 testedwith = '4.1.3 4.2.3 4.3.2 4.4.2'
 minimumhgversion = '4.1'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r b834cb64f779 -r 4d7e002a2bb5 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Thu Dec 14 00:53:55 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Sat Dec 16 23:52:32 2017 +0100
@@ -174,7 +174,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.6.1.dev'
+__version__ = '0.7.0.dev'
 
 testedwith = '4.1.3 4.2.3 4.3.3 4.4.2'
 minimumhgversion = '4.1'
diff -r b834cb64f779 -r 4d7e002a2bb5 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Thu Dec 14 00:53:55 2017 +0100
+++ b/tests/test-discovery-obshashrange.t	Sat Dec 16 23:52:32 2017 +0100
@@ -187,7 +187,7 @@
   running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob)
   sending hello command
   sending between command
-  remote: 483
+  remote: 495
   remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 batch * (glob)
   remote: 1
   preparing listkeys for "phases"
@@ -222,7 +222,7 @@
   45f8b879de922f6a6e620ba04205730335b6fc7e
   sending unbundle command
   bundle2-output-bundle: "HG20", 4 parts total
-  bundle2-output-part: "replycaps" 185 bytes payload
+  bundle2-output-part: "replycaps" 195 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
diff -r b834cb64f779 -r 4d7e002a2bb5 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Thu Dec 14 00:53:55 2017 +0100
+++ b/tests/test-topic-stack.t	Sat Dec 16 23:52:32 2017 +0100
@@ -864,13 +864,13 @@
   |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(content) as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(parent) as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(user) as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg export .
   # HG changeset patch
diff -r b834cb64f779 -r 4d7e002a2bb5 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Thu Dec 14 00:53:55 2017 +0100
+++ b/tests/test-wireproto.t	Sat Dec 16 23:52:32 2017 +0100
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
+  _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
 
 Check we cannot use pushkey for marker exchange anymore