Mercurial > evolve
changeset 1457:8667fb943ebb
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 25 Jun 2015 17:46:24 -0700 |
| parents | 8ca31deb8db7 (current diff) 773f3edb3cb2 (diff) |
| children | 5dfb18b98a55 |
| files | |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jun 25 17:38:40 2015 -0700 +++ b/.hgtags Thu Jun 25 17:46:24 2015 -0700 @@ -36,3 +36,5 @@ c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3 891c3ce894fa879532299910735bcc2a968245b1 5.1.4 1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5 +c79bdc8563509cd4e99946593d0b39af40271a30 5.2.0 +00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0
--- a/README Thu Jun 25 17:38:40 2015 -0700 +++ b/README Thu Jun 25 17:46:24 2015 -0700 @@ -51,7 +51,7 @@ Changelog ========= -5.2.0 -- +5.2.0 -- 2015-06-25 - evolve: gain a --rev option to control what revisions to evolve (issue4391) - evolve: revision are processed in the order they stack on destination
--- a/debian/changelog Thu Jun 25 17:38:40 2015 -0700 +++ b/debian/changelog Thu Jun 25 17:46:24 2015 -0700 @@ -1,8 +1,9 @@ -mercurial-evolve (5.1.5-1) UNRELEASED; urgency=medium +mercurial-evolve (5.2.0-1) UNRELEASED; urgency=medium * New upstream release. + * New upstream version - -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Tue, 23 Jun 2015 15:30:07 -0700 + -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> 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:38:40 2015 -0700 +++ b/hgext/evolve.py Thu Jun 25 17:46:24 2015 -0700 @@ -19,7 +19,7 @@ - improves some aspect of the early implementation in Mercurial core ''' -__version__ = '5.1.5' +__version__ = '5.2' testedwith = '3.3.3 3.4.1' buglink = 'http://bz.selenic.com/'