hgext3rd/evolve/__init__.py
changeset 1822 8cf82e55f48c
parent 1812 5217c745bb60
parent 1806 9f42f819267b
child 1823 649d7a574c3f
--- a/hgext3rd/evolve/__init__.py	Tue Nov 01 16:19:33 2016 +0100
+++ b/hgext3rd/evolve/__init__.py	Tue Feb 28 17:27:44 2017 +0100
@@ -4146,7 +4146,19 @@
     """Used by the evolve function to merge dest on top of pctx.
     return the same tuple as merge.graft"""
     if repo['.'].rev() != dest.rev():
-       merge.update(repo, dest, False, True, False)
+        #assert False
+        try:
+            merge.update(repo,
+                         dest,
+                         branchmerge=False,
+                         force=True)
+        except TypeError:
+            # Mercurial  < 43c00ca887d1 (3.7)
+            merge.update(repo,
+                         dest,
+                         branchmerge=False,
+                         force=True,
+                         partial=False)
     if bmactive(repo):
        repo.ui.status(_("(leaving bookmark %s)\n") % bmactive(repo))
     bmdeactivate(repo)