Mercurial > evolve
changeset 4872:7787baa5a6ae
branching: merge back with stable
version 9.2.0 have been released
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 28 Sep 2019 13:15:02 +0200 |
| parents | a8ff17479fb8 (current diff) ca34404abaef (diff) |
| children | 77e8ca85d740 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 5 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 27 12:50:19 2019 +0200 +++ b/.hgtags Sat Sep 28 13:15:02 2019 +0200 @@ -81,3 +81,4 @@ 05c9dcf5512ed77490a35b4d6b1c3fe860259f48 8.5.1 756db65030c64b22836fe236d1db3b95477e3ef7 9.0.0 6f37fdad7ac123ca0a76872ac4639bd1f3c248f7 9.1.0 +40795751be1c329ec23202ecd79ba45623e1df66 9.2.0
--- a/CHANGELOG Fri Sep 27 12:50:19 2019 +0200 +++ b/CHANGELOG Sat Sep 28 13:15:02 2019 +0200 @@ -1,17 +1,7 @@ Changelog ========= -9.2.0 - in progress -------------------- - - * python3: beta support for Python 3.6+ - (thanks to ludovicchabant, martinvonz and rgomes for their hard work) - * prune: clarify error message when no revision were passed, - * evolve: avoid possible race conditions bu locking earlier - * abort: add support for `evolve` and `pick` to `hg abort` (hg-5.1+) - * rewind: add --keep flag to preserve working copy - -9.1.1 - in progress +9.2.0 -- 2019-09-28 ------------------- * evolve: check that relocating makes sense in _solvedivergent() (issue5958) @@ -21,6 +11,13 @@ * stack: make sure to preserve dependencies, fixes certain complex cases * prune: improve documentation for `--pair` + * python3: beta support for Python 3.6+ + (thanks to ludovicchabant, martinvonz and rgomes for their hard work) + * prune: clarify error message when no revision were passed, + * evolve: avoid possible race conditions bu locking earlier + * abort: add support for `evolve` and `pick` to `hg abort` (hg-5.1+) + * rewind: add --keep flag to preserve working copy + 9.1.0 -- 2019-07-29 -------------------
--- a/debian/changelog Fri Sep 27 12:50:19 2019 +0200 +++ b/debian/changelog Sat Sep 28 13:15:02 2019 +0200 @@ -1,3 +1,9 @@ +mercurial-evolve (9.2.0-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sat, 28 Sep 2019 12:49:41 +0200 + mercurial-evolve (9.1.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Fri Sep 27 12:50:19 2019 +0200 +++ b/hgext3rd/evolve/metadata.py Sat Sep 28 13:15:02 2019 +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__ = b'9.2.0.dev' +__version__ = b'9.3.0.dev' testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1' minimumhgversion = b'4.5' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Fri Sep 27 12:50:19 2019 +0200 +++ b/hgext3rd/topic/__init__.py Sat Sep 28 13:15:02 2019 +0200 @@ -187,7 +187,7 @@ b'topic.active': b'green', } -__version__ = b'0.17.0.dev' +__version__ = b'0.18.0.dev' testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1' minimumhgversion = b'4.5'