# HG changeset patch # User Anton Shestakov # Date 1657637354 -14400 # Node ID 2c36ef2eadd51526c6d851fb29d907e520f4fe66 # Parent 14152b9abf936136536e17aabdcd0750c5906920# Parent 9befdde455e7935bdf85e94cc2b44eef142e8766 test-compat: merge mercurial-5.8 into mercurial-5.7 diff -r 14152b9abf93 -r 2c36ef2eadd5 .gitlab-ci.yml diff -r 14152b9abf93 -r 2c36ef2eadd5 .hgtags --- a/.hgtags Mon Apr 25 22:05:30 2022 +0400 +++ b/.hgtags Tue Jul 12 18:49:14 2022 +0400 @@ -99,3 +99,4 @@ de530d27554b43c00509696dc7a1496f5129e1a4 10.4.0 64bb9c4a13d388233d4d6d9b761ece9c6ce77fb3 10.4.1 0d53a8d4170b32d03e4fd8582b32fe2790d5e34f 10.5.0 +62f31db544594837a71cb91a7c1e8e515c5a52e9 10.5.1 diff -r 14152b9abf93 -r 2c36ef2eadd5 CHANGELOG --- a/CHANGELOG Mon Apr 25 22:05:30 2022 +0400 +++ b/CHANGELOG Tue Jul 12 18:49:14 2022 +0400 @@ -1,7 +1,16 @@ Changelog ========= -10.5.1 - in progress +10.5.2 - in progress +-------------------- + + * compatibility with Mercurial 6.2 + +topic (0.24.1) + + * compatibility with Mercurial 6.2 + +10.5.1 -- 2022-04-26 -------------------- * evolve: avoid updating working copy when --dry-run is given (issue6669) diff -r 14152b9abf93 -r 2c36ef2eadd5 debian/changelog --- a/debian/changelog Mon Apr 25 22:05:30 2022 +0400 +++ b/debian/changelog Tue Jul 12 18:49:14 2022 +0400 @@ -1,3 +1,15 @@ +mercurial-evolve (10.5.2-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov Tue, 12 Jul 2022 16:41:35 +0400 + +mercurial-evolve (10.5.1-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov Tue, 26 Apr 2022 12:58:30 +0400 + mercurial-evolve (10.5.0-1) unstable; urgency=medium * new upstream release diff -r 14152b9abf93 -r 2c36ef2eadd5 hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Mon Apr 25 22:05:30 2022 +0400 +++ b/hgext3rd/evolve/metadata.py Tue Jul 12 18:49:14 2022 +0400 @@ -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.5.1.dev' -testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' +__version__ = b'10.5.2' +testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2' minimumhgversion = b'4.8' buglink = b'https://bz.mercurial-scm.org/' diff -r 14152b9abf93 -r 2c36ef2eadd5 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Mon Apr 25 22:05:30 2022 +0400 +++ b/hgext3rd/topic/__init__.py Tue Jul 12 18:49:14 2022 +0400 @@ -231,9 +231,9 @@ b'log.topic': b'green_background', } -__version__ = b'0.24.1.dev' +__version__ = b'0.24.1' -testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' +testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2' minimumhgversion = b'4.8' buglink = b'https://bz.mercurial-scm.org/'