# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1645511051 -10800
# Node ID 94bf0768040a389bbe80758622741ece3059c25d
# Parent  d5759f574fd93e0780aa02ca83bc0c62322c1c0a
fixup: provide base to merge.graft()

This way it's compatible with older versions of Mercurial (<= 5.3). In newer
versions base is optional and defaults to ctx.p1().

diff -r d5759f574fd9 -r 94bf0768040a hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Jan 07 20:10:03 2022 +0100
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Feb 22 09:24:11 2022 +0300
@@ -1584,7 +1584,7 @@
         tempctx = repo[tempnode]
         compat.clean_update(repo[startnode])
 
-        stats = merge.graft(repo, tempctx, labels=[b'graft', b'fixup'])
+        stats = merge.graft(repo, tempctx, tempctx.p1(), [b'graft', b'fixup'])
         # conflict is not possible, since grafting changes from descendant
         assert not stats.unresolvedcount
         repair.strip(ui, repo, [tempnode], backup=False)