Mercurial > evolve
changeset 4574:5e8c47c553db
branching: merge with stable
VErsion 8.5.0 got released
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 24 Apr 2019 14:38:26 +0200 |
| parents | 8b3781d9a616 (current diff) f23a490521f6 (diff) |
| children | 903e8b983fac |
| files | CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 6 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Apr 23 13:26:35 2019 +0200 +++ b/.hgtags Wed Apr 24 14:38:26 2019 +0200 @@ -78,3 +78,4 @@ 97b18934d6db9e7e7eaa3fb656c0411d7f43af26 8.3.3 8c4289d0e91e95b3281c378e1ac3f4ff4678b4d3 8.4.0 33c617626fd90a0a00e831b4762f64fecb609317 8.5.0 +05c9dcf5512ed77490a35b4d6b1c3fe860259f48 8.5.1
--- a/CHANGELOG Tue Apr 23 13:26:35 2019 +0200 +++ b/CHANGELOG Wed Apr 24 14:38:26 2019 +0200 @@ -7,16 +7,17 @@ * evolve: drop compatibility with 4.4 * evolve: reinstalled compatibility with narrow repositories, -8.5.1 - in progress +8.5.1 -- 2019-04-23 ------------------- * evolve: make sure we use upstream merge code with 5.0, * evolve: restore compatibility with 4.4 (This regress the narrow compatibility) + * evolve: fix progress display with hg <= 4.6 * topic: compatibility with mercurial-5.0, * topic: improve extensions isolation (issue6121). -8.5.0 -- 2019-04-23 +8.5.0 -- 2019-04-12 ------------------- * evolve: fix an recoverable state (issue6053),
--- a/debian/changelog Tue Apr 23 13:26:35 2019 +0200 +++ b/debian/changelog Wed Apr 24 14:38:26 2019 +0200 @@ -1,4 +1,10 @@ -mercurial-evolve (8.5.0-1) UNRELEASED; urgency=medium +mercurial-evolve (8.5.1-0) UNRELEASED; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Tue, 23 Apr 2019 15:30:11 +0200 + +mercurial-evolve (8.5.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/compat.py Tue Apr 23 13:26:35 2019 +0200 +++ b/hgext3rd/evolve/compat.py Wed Apr 24 14:38:26 2019 +0200 @@ -67,7 +67,7 @@ progress.complete() else: def progress(ui, topic, pos, item="", unit="", total=None): - ui.progress(topic, pos, item="", unit="", total=None) + ui.progress(topic, pos, item, unit, total) # XXX: Better detection of property cache if 'predecessors' not in dir(obsolete.obsstore):
--- a/hgext3rd/evolve/metadata.py Tue Apr 23 13:26:35 2019 +0200 +++ b/hgext3rd/evolve/metadata.py Wed Apr 24 14:38:26 2019 +0200 @@ -6,6 +6,6 @@ # GNU General Public License version 2 or any later version. __version__ = '8.6.0.dev' -testedwith = '4.5.2 4.6.2 4.7 4.8 4.9' +testedwith = '4.5.2 4.6.2 4.7 4.8 4.9 5.0' minimumhgversion = '4.5' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Tue Apr 23 13:26:35 2019 +0200 +++ b/hgext3rd/topic/__init__.py Wed Apr 24 14:38:26 2019 +0200 @@ -182,7 +182,7 @@ __version__ = '0.15.0.dev' -testedwith = '4.5.2 4.6.2 4.7 4.8 4.9' +testedwith = '4.5.2 4.6.2 4.7 4.8 4.9 5.0' minimumhgversion = '4.5' buglink = 'https://bz.mercurial-scm.org/'