# HG changeset patch # User Pierre-Yves David # Date 1407538504 25200 # Node ID 0fcddde7dae613d1ebf654eb41cc7231540786a9 # Parent 9d538ebf3985433076462ebfa6cd5f17e3051425# Parent acc2b590edd912e7d7b951081c6f0c87b2b0c8f9 merge with stable diff -r 9d538ebf3985 -r 0fcddde7dae6 .hgtags --- 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 diff -r 9d538ebf3985 -r 0fcddde7dae6 README --- 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 diff -r 9d538ebf3985 -r 0fcddde7dae6 debian/changelog --- 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 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 Tue, 03 Jun 2014 15:37:23 -0700 + -- Pierre-Yves David Fri, 08 Aug 2014 15:48:16 -0700 mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low diff -r 9d538ebf3985 -r 0fcddde7dae6 hgext/evolve.py diff -r 9d538ebf3985 -r 0fcddde7dae6 tests/test-evolve.t diff -r 9d538ebf3985 -r 0fcddde7dae6 tests/test-exchange-D4.t diff -r 9d538ebf3985 -r 0fcddde7dae6 tests/test-stabilize-conflict.t diff -r 9d538ebf3985 -r 0fcddde7dae6 tests/test-stabilize-result.t