Mercurial > evolve
changeset 1181:ad7a31a7a413
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 30 Nov 2014 00:11:06 -0800 |
| parents | 8d28bb4fc127 (current diff) b6acfd96c858 (diff) |
| children | 253293df84a6 |
| files | hgext/evolve.py tests/test-simple4server-bundle2.t |
| diffstat | 4 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Nov 20 15:49:52 2014 -0800 +++ b/.hgtags Sun Nov 30 00:11:06 2014 -0800 @@ -26,3 +26,6 @@ e914884fb7210d6350d94909cb25ebc602359680 4.0.1 4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0 c13b408c00066af78cda88734909c6f2f3505f76 5.0.0 +51e1e962172c0178394cd36652d90181319f5416 5.0.1 +51e1e962172c0178394cd36652d90181319f5416 5.0.1 +0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1
--- a/README Thu Nov 20 15:49:52 2014 -0800 +++ b/README Sun Nov 30 00:11:06 2014 -0800 @@ -48,11 +48,18 @@ Changelog ========= -5.0.1 -- +5.0.1 -- 2014-11-25 - amend: fix --logfile argument - evolve: preserve branch change when evolving - evolve: fix potential crash while solving `bumped` changesets. +- uncommit: abort when rev specifies the current changeset +- evolve: various message improvement +- evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) +- evolve: make next/prev only move bookmarks optionally +- evolve: tell user which "base of divergent changeset" is not found + + 5.0.0 -- 2014-10-22
--- a/debian/changelog Thu Nov 20 15:49:52 2014 -0800 +++ b/debian/changelog Sun Nov 30 00:11:06 2014 -0800 @@ -1,3 +1,9 @@ +mercurial-evolve (5.0.1-1) unstable; urgency=medium + + * New upstream release. + + -- Faheem Mitha <faheem@faheem.info> Wed, 12 Nov 2014 11:24:28 +0530 + mercurial-evolve (4.1.0-1) unstable; urgency=medium * new upstream release
--- a/hgext/evolve.py Thu Nov 20 15:49:52 2014 -0800 +++ b/hgext/evolve.py Sun Nov 30 00:11:06 2014 -0800 @@ -19,7 +19,7 @@ - improves some aspect of the early implementation in Mercurial core ''' -__version__ = '5.0.0' +__version__ = '5.0.1' testedwith = '3.2' buglink = 'http://bz.selenic.com/' @@ -1576,7 +1576,7 @@ newer = [n for n in newer if n and ctx.node() not in n] if newer: return base, tuple(ctx._repo[o] for o in newer[0]) - raise util.Abort('base of divergent changeset not found', + raise util.Abort("base of divergent changeset %s not found" % ctx, hint='this case is not yet handled')