--- 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)