Mercurial > evolve
changeset 2265:dad84c052463
merge back with default
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sat, 01 Apr 2017 12:45:18 +0200 |
| parents | 446824c5e0b8 (current diff) 237ea5ce21a3 (diff) |
| children | 080b9384d741 |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Mar 31 14:50:50 2017 +0200 +++ b/.hgtags Sat Apr 01 12:45:18 2017 +0200 @@ -46,3 +46,4 @@ 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0 e7b6e9c4a5d4317f56c2862910c569723b6ea71b 5.6.0 70694b2621ba9d919bc38303f8901e84caf5da0f 5.6.1 +165ad227993de4e7d819cc6c820d5b9f7b38b80d 6.0.0
--- a/README Fri Mar 31 14:50:50 2017 +0200 +++ b/README Sat Apr 01 12:45:18 2017 +0200 @@ -112,8 +112,8 @@ Changelog ========= -6.0.0 -- In progress --------------------- +6.0.0 -- 2017-02-31 +------------------- - push: improved detection of obsoleted remote branch (issue4354), - drop compatibility for Mercurial < 3.8,
--- a/debian/changelog Fri Mar 31 14:50:50 2017 +0200 +++ b/debian/changelog Sat Apr 01 12:45:18 2017 +0200 @@ -1,9 +1,10 @@ -mercurial-evolve (5.6.1-1) UNRELEASED; urgency=medium +mercurial-evolve (6.0.0-1) UNRELEASED; urgency=medium * New Upstream Release * new upstream version + * new upstream release - -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Tue, 28 Feb 2017 17:21:34 +0100 + -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Fri, 31 Mar 2017 15:50:12 +0200 mercurial-evolve (5.5.0-1) unstable; urgency=medium
--- a/hgext3rd/evolve/metadata.py Fri Mar 31 14:50:50 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Sat Apr 01 12:45:18 2017 +0200 @@ -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__ = '6.0.0.dev' -testedwith = '3.8.4 3.9.2 4.0.2 4.1' +__version__ = '6.0.0' +testedwith = '3.8.4 3.9.2 4.0.2 4.1.1' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/'