Mercurial > evolve
changeset 1426:6db55f28c965
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 23 Jun 2015 15:32:47 -0700 |
| parents | ecd669c36c12 (current diff) e8f875227901 (diff) |
| children | fcc467ca740e |
| files | README hgext/evolve.py tests/test-evolve.t |
| diffstat | 4 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jun 23 00:00:03 2015 -0700 +++ b/.hgtags Tue Jun 23 15:32:47 2015 -0700 @@ -35,3 +35,4 @@ e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2 c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3 891c3ce894fa879532299910735bcc2a968245b1 5.1.4 +1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5
--- a/README Tue Jun 23 00:00:03 2015 -0700 +++ b/README Tue Jun 23 15:32:47 2015 -0700 @@ -65,7 +65,7 @@ descendant of the current working copy. The old behavior of `--all` in now in `--all --any`. -5.1.5 -- +5.1.5 -- 2015-06-23 - minor documentation cleanup - support -i option for `hg amend` if commit supports it (3.4)
--- a/debian/changelog Tue Jun 23 00:00:03 2015 -0700 +++ b/debian/changelog Tue Jun 23 15:32:47 2015 -0700 @@ -1,3 +1,9 @@ +mercurial-evolve (5.1.5-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Tue, 23 Jun 2015 15:30:07 -0700 + mercurial-evolve (5.1.3-1) unstable; urgency=medium * new upstream release
--- a/hgext/evolve.py Tue Jun 23 00:00:03 2015 -0700 +++ b/hgext/evolve.py Tue Jun 23 15:32:47 2015 -0700 @@ -19,7 +19,7 @@ - improves some aspect of the early implementation in Mercurial core ''' -__version__ = '5.1.4' +__version__ = '5.1.5' testedwith = '3.3.3 3.4.1' buglink = 'http://bz.selenic.com/'