# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1488288125 -3600
# Node ID 19df96c0d670c854f95cba3a3c91427c74c232ea
# Parent  377d94d6c8891885584086419cc2670302fa47cd
compat: drop hack around a 'graft' signature change

We only support recent only version of Mercurial now.

diff -r 377d94d6c889 -r 19df96c0d670 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Tue Feb 28 14:21:17 2017 +0100
+++ b/hgext3rd/evolve/__init__.py	Tue Feb 28 14:22:05 2017 +0100
@@ -4184,15 +4184,4 @@
             with repo.vfs.open('topic', 'w') as f:
                 f.write(orig.topic())
 
-    try:
-       r = merge.graft(repo, orig, pctx, ['local', 'graft'], True)
-    except TypeError:
-       # not using recent enough mercurial
-       if len(orig.parents()) == 2:
-           raise error.Abort(
-               _("no support for evolving merge changesets yet"),
-               hint=_("Redo the merge and use `hg prune <old> --succ "
-                      "<new>` to obsolete the old one"))
-
-       r = merge.graft(repo, orig, pctx, ['local', 'graft'])
-    return r
+    return merge.graft(repo, orig, pctx, ['local', 'graft'], True)