Mercurial > evolve
changeset 3589:e4ac2e2c2086 stable 7.3.0
branching: merge future 7.3.0 into stable
Release belong to stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:03:46 +0100 |
| parents | 382ea8cd8b66 (current diff) 2e7a9f6df411 (diff) |
| children | d5adce52cef4 3e638a94ff18 |
| files | |
| diffstat | 4 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Wed Mar 21 15:57:53 2018 +0100 +++ b/CHANGELOG Wed Mar 21 16:03:46 2018 +0100 @@ -1,7 +1,7 @@ Changelog ========= -7.3.0 --(in-progress) +7.3.0 -- 2018-03-21 --------------------- * grab: new command to grab a changeset, put in on wdir parent @@ -9,12 +9,8 @@ * resolve: shows how to continue evolve after resolving all conflicts * evolve: `--continue` flag now continue evolving all the remaining revisions * prev and next now prompts user to choose a changeset in case of ambiguity - when ui.interactive is turned on * evolve: a new `--stop` flag which can be used to stop interrupted evolution -7.2.2 -- (in-progress) ----------------------- - * fold: fix issue related to bookmarks movement (issue5772) * amend: take lock before parsing the commit description (issue5266) * legacy: respect 'server.bundle1' config if any is set
--- a/debian/changelog Wed Mar 21 15:57:53 2018 +0100 +++ b/debian/changelog Wed Mar 21 16:03:46 2018 +0100 @@ -1,3 +1,9 @@ +mercurial-evolve (7.3.0-1) unstable; urgency=medium + + * New upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 21 Mar 2018 15:34:15 +0100 + mercurial-evolve (7.2.1-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Wed Mar 21 15:57:53 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Wed Mar 21 16:03:46 2018 +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__ = '7.3.0.dev' -testedwith = '4.1.3 4.2.3 4.3.2 4.4.2' +__version__ = '7.3.0' +testedwith = '4.1.3 4.2.3 4.3.2 4.4.2 4.5.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Wed Mar 21 15:57:53 2018 +0100 +++ b/hgext3rd/topic/__init__.py Wed Mar 21 16:03:46 2018 +0100 @@ -176,9 +176,9 @@ 'topic.active': 'green', } -__version__ = '0.8.0.dev' +__version__ = '0.8.0' -testedwith = '4.1.3 4.2.3 4.3.3 4.4.2' +testedwith = '4.1.3 4.2.3 4.3.3 4.4.2 4.5.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'