Mercurial > evolve
changeset 3722:57d52e415ebb mercurial-4.5
test-compat: merge stable into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 25 Apr 2018 14:09:34 +0100 |
| parents | 4358f29af833 (current diff) 69d6271f1067 (diff) |
| children | e70ad3983872 4c68dd62943c |
| files | |
| diffstat | 5 files changed, 25 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Apr 24 08:57:18 2018 +0100 +++ b/.hgtags Wed Apr 25 14:09:34 2018 +0100 @@ -65,3 +65,4 @@ bf6b859807bac23752a26e58876fe3a4a9a2fef8 7.2.0 6c772398eb4e209914e1074cdac4f3ebf714e437 7.2.1 e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0 +116cdd8c102ab0ae6295fb4886b0882e75e4d8f7 8.0.0
--- a/CHANGELOG Tue Apr 24 08:57:18 2018 +0100 +++ b/CHANGELOG Wed Apr 25 14:09:34 2018 +0100 @@ -1,24 +1,26 @@ Changelog ========= -8.0.0 - in progress +8.0.0 -- 2018-04-25 ------------------- + * evolve: a new `--abort` flag which aborts an interrupted evolve + resolving orphans, + * `hg evolve` now return 0 if there is nothing to evolve, + * amend: a new `--patch` flag to make changes to wdir parent by editing patch, + * evolve: fixed some memory leak issue, + * evolve: prevent some crash with merge and split (issue5833 and issue5832), + * evolve: improvemed support for solving phase-divergence situation, + * evolve: improvemed support for solving orphan situation, + * obsdiscovery: added unit to various progress bar, + * evolve: record "operation" for command where it was missing, + + * compatibility with Mercurial 4.6 * drop support for Mercurial 4.1 and 4.2 * `--obsolete` and `--old-obsolete` flags for `hg graft` are dropped - * evolve: a new `--abort` flag which aborts an interrupted evolve - resolving orphans - * `hg evolve` now return 0 if there is nothing to evolve - * amend: a new `--patch` flag to make changes to wdir parent by editing patch - - * fixed some memory leak issue - * templatekw: remove `obsfatedata` templatekw. Individuals fields are available in core as single template functions. - - * fixed issue 5833 and 5832 - - * topic: restring name to letter, '-', '_' and '.' + * topic: restraining name to letter, '-', '_' and '.' 7.3.0 -- 2018-03-21 ---------------------
--- a/debian/changelog Tue Apr 24 08:57:18 2018 +0100 +++ b/debian/changelog Wed Apr 25 14:09:34 2018 +0100 @@ -1,3 +1,9 @@ +mercurial-evolve (8.0.0-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 25 Apr 2018 14:01:18 +0100 + mercurial-evolve (7.3.0-1) unstable; urgency=medium * New upstream release
--- a/hgext3rd/evolve/metadata.py Tue Apr 24 08:57:18 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Wed Apr 25 14:09:34 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__ = '8.0.0.dev' -testedwith = '4.3.2 4.4.2 4.5.2' +__version__ = '8.0.0' +testedwith = '4.3.2 4.4.2 4.5.2 4.6' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Tue Apr 24 08:57:18 2018 +0100 +++ b/hgext3rd/topic/__init__.py Wed Apr 25 14:09:34 2018 +0100 @@ -176,9 +176,9 @@ 'topic.active': 'green', } -__version__ = '0.9.0.dev' +__version__ = '0.9.0' -testedwith = '4.3.3 4.4.2 4.5.2' +testedwith = '4.3.3 4.4.2 4.5.2 4.6' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'