# HG changeset patch # User Pierre-Yves David # Date 1604166669 -3600 # Node ID 4c1eb455259f8660be96ce0c42e7ce6495d51145 # Parent 87ee065a688be1e3d40336572ca6d5273927757c# Parent d75cea88bc4b601fe5c0180319e0a4e568f09b96 branching: merge stable into default diff -r d75cea88bc4b -r 4c1eb455259f hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Sat Oct 31 18:42:25 2020 +0100 +++ b/hgext3rd/evolve/metadata.py Sat Oct 31 18:51:09 2020 +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__ = b'10.1.1.dev' +__version__ = b'10.2.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/' diff -r d75cea88bc4b -r 4c1eb455259f hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Sat Oct 31 18:42:25 2020 +0100 +++ b/hgext3rd/topic/__init__.py Sat Oct 31 18:51:09 2020 +0100 @@ -232,7 +232,7 @@ b'topic.active': b'green', } -__version__ = b'0.20.1.dev' +__version__ = b'0.21.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6' minimumhgversion = b'4.6'