Mercurial > evolve
changeset 3596:c965692c0f5e
packaging: merge stable back into default
Version have been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 22 Mar 2018 00:49:04 +0100 |
| parents | 944a8c27d27b (current diff) 6d08873b5e2f (diff) |
| children | 501070b973be |
| files | tests/test-discovery-obshashrange.t tests/test-wireproto.t |
| diffstat | 5 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 21 17:03:55 2018 +0530 +++ b/.hgtags Thu Mar 22 00:49:04 2018 +0100 @@ -64,3 +64,4 @@ 06a3cb59495636df8b567e49a0fd7fd8fd823074 7.1.0 bf6b859807bac23752a26e58876fe3a4a9a2fef8 7.2.0 6c772398eb4e209914e1074cdac4f3ebf714e437 7.2.1 +e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0
--- a/CHANGELOG Wed Mar 21 17:03:55 2018 +0530 +++ b/CHANGELOG Thu Mar 22 00:49:04 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 17:03:55 2018 +0530 +++ b/debian/changelog Thu Mar 22 00:49:04 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 17:03:55 2018 +0530 +++ b/hgext3rd/evolve/metadata.py Thu Mar 22 00:49:04 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.1.dev' +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 17:03:55 2018 +0530 +++ b/hgext3rd/topic/__init__.py Thu Mar 22 00:49:04 2018 +0100 @@ -176,9 +176,9 @@ 'topic.active': 'green', } -__version__ = '0.8.0.dev' +__version__ = '0.8.1.dev' -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/'