Mercurial > evolve
changeset 5469:e9cab92de933
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 31 Jul 2020 22:07:49 +0800 |
| parents | 698a37759e31 (current diff) f9a53fce3cf7 (diff) |
| children | 4993cdeef79c |
| files | CHANGELOG debian/changelog hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py tests/test-topic-push.t |
| diffstat | 6 files changed, 27 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 27 13:11:55 2020 +0800 +++ b/.hgtags Fri Jul 31 22:07:49 2020 +0800 @@ -87,3 +87,4 @@ 583dc6ef3eb21fbf6574021136f32b8a1163506c 9.3.0 8d955635cf457aaa4810d77740721d4275001f74 9.3.1 27d57ca8686590867e62e3d42c96bad84a5f56ef 10.0.0 +fb543438704b73b22023a493c9ef76fc8746b796 10.0.1
--- a/CHANGELOG Mon Jul 27 13:11:55 2020 +0800 +++ b/CHANGELOG Fri Jul 31 22:07:49 2020 +0800 @@ -4,15 +4,25 @@ 10.1.0 - in progress -------------------- - * compatibility with Mercurial 5.5 - * numerous minor changes to packaging, README moved to README.rst topic (0.20.0) + * stack: support foo#stack relation revset (hg-5.4+ only) + +10.0.1 -- 2020-07-31 +-------------------- + * compatibility with Mercurial 5.5 - * stack: support foo#stack relation revset (hg-5.4+ only) + * evolve: update the template keywords section in `hg help -e evolve` + + * obslog: make obslog --no-origin -f work with multiple successor sets + +topic (0.19.1) + + * compatibility with Mercurial 5.5 + * topic: hg push --topic does-not-exist now doesn't try to push unrelated changesets and aborts instead * topic: hg outgoing/push --topic . will use current topic
--- a/debian/changelog Mon Jul 27 13:11:55 2020 +0800 +++ b/debian/changelog Fri Jul 31 22:07:49 2020 +0800 @@ -1,3 +1,9 @@ +mercurial-evolve (10.0.1-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Fri, 31 Jul 2020 19:44:25 +0800 + mercurial-evolve (10.0.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Mon Jul 27 13:11:55 2020 +0800 +++ b/hgext3rd/evolve/metadata.py Fri Jul 31 22:07:49 2020 +0800 @@ -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.0.1.dev' -testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4' +__version__ = b'10.1.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' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/pullbundle.py Mon Jul 27 13:11:55 2020 +0800 +++ b/hgext3rd/pullbundle.py Fri Jul 31 22:07:49 2020 +0800 @@ -93,9 +93,9 @@ from mercurial.i18n import _ -__version__ = b'0.1.1' -testedwith = b'4.4 4.5 4.6 4.7.1' -minimumhgversion = b'4.4' +__version__ = b'0.1.3.dev' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5' +minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/' cmdtable = {}
--- a/hgext3rd/topic/__init__.py Mon Jul 27 13:11:55 2020 +0800 +++ b/hgext3rd/topic/__init__.py Fri Jul 31 22:07:49 2020 +0800 @@ -202,9 +202,9 @@ b'topic.active': b'green', } -__version__ = b'0.19.1.dev' +__version__ = b'0.20.0.dev' -testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'