Mercurial > evolve
changeset 1462:5dfb18b98a55
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 26 Jun 2015 00:07:13 -0700 |
| parents | 8667fb943ebb (current diff) dd89ed2bb77e (diff) |
| children | c3f6e97c71b1 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jun 25 17:46:24 2015 -0700 +++ b/.hgtags Fri Jun 26 00:07:13 2015 -0700 @@ -6,7 +6,6 @@ 7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5 4a5488c01a66be4729252175cea0ea739a88a540 0.6 18a0d96ed559089edf90206c469f3f8c26681c64 0.7 -18a0d96ed559089edf90206c469f3f8c26681c64 0.7 1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7 b18b000363550f02f413aed008f8e306318c608c 1.0.0 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1 @@ -27,7 +26,6 @@ 4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0 c13b408c00066af78cda88734909c6f2f3505f76 5.0.0 51e1e962172c0178394cd36652d90181319f5416 5.0.1 -51e1e962172c0178394cd36652d90181319f5416 5.0.1 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2 bfe9be352453640233371cc7deb409a09decacf9 5.1.0 @@ -38,3 +36,4 @@ 1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5 c79bdc8563509cd4e99946593d0b39af40271a30 5.2.0 00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0 +44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
--- a/debian/changelog Thu Jun 25 17:46:24 2015 -0700 +++ b/debian/changelog Fri Jun 26 00:07:13 2015 -0700 @@ -1,9 +1,8 @@ -mercurial-evolve (5.2.0-1) UNRELEASED; urgency=medium +mercurial-evolve (5.2.0-1) unstable; urgency=medium * New upstream release. - * New upstream version - -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Thu, 25 Jun 2015 17:41:56 -0700 + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Thu, 25 Jun 2015 17:41:56 -0700 mercurial-evolve (5.1.3-1) unstable; urgency=medium
--- a/hgext/evolve.py Thu Jun 25 17:46:24 2015 -0700 +++ b/hgext/evolve.py Fri Jun 26 00:07:13 2015 -0700 @@ -19,7 +19,7 @@ - improves some aspect of the early implementation in Mercurial core ''' -__version__ = '5.2' +__version__ = '5.2.0' testedwith = '3.3.3 3.4.1' buglink = 'http://bz.selenic.com/'