# HG changeset patch # User Pierre-Yves David # Date 1500994684 -7200 # Node ID ed584b6b3f6e43807ac9f7f03e73892e5fd45e9e # Parent 4ec404e68abdb16466b944ef4bcbae64f8fdf320# Parent 768e2629cb488c5bf7bb8761fd3591dff5fe2e60 branching: merge with other stable head diff -r 4ec404e68abd -r ed584b6b3f6e hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Tue Jul 25 16:56:27 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Tue Jul 25 16:58:04 2017 +0200 @@ -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__ = '6.6.0' +__version__ = '6.6.1.dev' testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.2' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/' diff -r 4ec404e68abd -r ed584b6b3f6e hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Tue Jul 25 16:56:27 2017 +0200 +++ b/hgext3rd/topic/__init__.py Tue Jul 25 16:58:04 2017 +0200 @@ -118,7 +118,7 @@ 'topic.active': 'green', } -version = '0.2.0' +version = '0.2.1.dev' testedwith = '4.0.2 4.1.3 4.2.1' minimumhgversion = '4.0' buglink = 'https://bz.mercurial-scm.org/'