Mercurial > evolve
changeset 4389:88887b2be07c
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 03 Feb 2019 12:04:50 +0100 |
| parents | 8494015ec24b (current diff) 20d1ceef2df2 (diff) |
| children | 312b9e8a4c9c |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/debian/changelog Wed Jan 30 04:45:40 2019 +0100 +++ b/debian/changelog Sun Feb 03 12:04:50 2019 +0100 @@ -1,4 +1,4 @@ -mercurial-evolve (8.4.0) UNRELEASED; urgency=medium +mercurial-evolve (8.4.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/compat.py Wed Jan 30 04:45:40 2019 +0100 +++ b/hgext3rd/evolve/compat.py Sun Feb 03 12:04:50 2019 +0100 @@ -261,7 +261,11 @@ if graft: tca = _c1.ancestor(_c2) - limit = copies._findlimit(repo, c1.rev(), c2.rev()) + # hg < 4.8 compat (dc50121126ae) + try: + limit = copies._findlimit(repo, c1, c2) + except (AttributeError, TypeError): + limit = copies._findlimit(repo, c1.rev(), c2.rev()) if limit is None: # no common ancestor, no copies return {}, {}, {}, {}, {}