# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1549191890 -3600
# Node ID 88887b2be07cbc5f346ecdac20b3fd4f0a84d8a7
# Parent  8494015ec24b221623c24060f77f9688c62f3d8d# Parent  20d1ceef2df24399bef9fdab793d1298441ee03f
branching: merge with stable

diff -r 8494015ec24b -r 88887b2be07c debian/changelog
--- 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
 
diff -r 8494015ec24b -r 88887b2be07c hgext3rd/evolve/compat.py
--- 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 {}, {}, {}, {}, {}