# HG changeset patch # User Pierre-Yves David # Date 1521644626 -3600 # Node ID e4ac2e2c2086f977afa35e23a62f849e9305a225 # Parent 382ea8cd8b669bb411cea494495e22bfbba0091f# Parent 2e7a9f6df41160e2200f2cd1ab582ec67c39ee57 branching: merge future 7.3.0 into stable Release belong to stable diff -r 382ea8cd8b66 -r e4ac2e2c2086 CHANGELOG --- 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 diff -r 382ea8cd8b66 -r e4ac2e2c2086 debian/changelog --- 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 Wed, 21 Mar 2018 15:34:15 +0100 + mercurial-evolve (7.2.1-1) unstable; urgency=medium * new upstream release diff -r 382ea8cd8b66 -r e4ac2e2c2086 hgext3rd/evolve/metadata.py --- 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/' diff -r 382ea8cd8b66 -r e4ac2e2c2086 hgext3rd/topic/__init__.py --- 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/'