Mercurial > evolve
changeset 1032:0fcddde7dae6
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 15:55:04 -0700 |
| parents | 9d538ebf3985 (current diff) acc2b590edd9 (diff) |
| children | 908273755215 |
| files | README hgext/evolve.py tests/test-evolve.t tests/test-exchange-D4.t tests/test-stabilize-conflict.t tests/test-stabilize-result.t |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Aug 06 17:05:57 2014 -0700 +++ b/.hgtags Fri Aug 08 15:55:04 2014 -0700 @@ -23,3 +23,4 @@ fc04758ea9f549684989ee673b04d9724756dc85 3.3.1 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2 0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0 +e914884fb7210d6350d94909cb25ebc602359680 4.0.1
--- a/README Wed Aug 06 17:05:57 2014 -0700 +++ b/README Fri Aug 08 15:55:04 2014 -0700 @@ -67,6 +67,10 @@ - push obsmarkers and phases in the same transaction than changesets (when using hg >= 3.1 and bundle2-exp is enabled) +4.0.1 -- 2014-08-08 + +- createmarkers() accept an iterable (for compat with other extension) + 4.0.0 -- 2014-06-03 - require Mercurial version 3.0.1 or above
--- a/debian/changelog Wed Aug 06 17:05:57 2014 -0700 +++ b/debian/changelog Fri Aug 08 15:55:04 2014 -0700 @@ -1,4 +1,10 @@ -mercurial-evolve (4.0.0-1) UNRELEASED; urgency=low +mercurial-evolve (4.0.1-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:50:09 -0700 + +mercurial-evolve (4.0.0-1) unstable; urgency=low [ Julien Cristau ] * New upstream release. @@ -6,7 +12,7 @@ [ Pierre-Yves David ] * new upstream release - -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Tue, 03 Jun 2014 15:37:23 -0700 + -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:48:16 -0700 mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low