# HG changeset patch # User Anton Shestakov # Date 1579782820 -25200 # Node ID a2391f91914100c29d5566d85c013f74c781afdd # Parent fd1d12497fdb2d80c0848c191e2e72107885c141 evolve: compatibility with copies.graftcopies() from hg 5.3 diff -r fd1d12497fdb -r a2391f919141 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Fri Nov 15 08:14:06 2019 -0800 +++ b/hgext3rd/evolve/evolvecmd.py Thu Jan 23 19:33:40 2020 +0700 @@ -1009,8 +1009,12 @@ repo.setparents(dest.node(), orig.node()) repo.dirstate.write(tr) # fix up dirstate for copies and renames - copies.duplicatecopies(repo, repo[None], dest.rev(), - orig.p1().rev()) + if util.safehasattr(copies, 'graftcopies'): + copies.graftcopies(repo[None], dest, orig.p1()) + else: + # hg <= 5.2 (2f0a44c69e07) + copies.duplicatecopies(repo, repo[None], dest.rev(), + orig.p1().rev()) dirstatedance(repo, dest, orig.node(), None) hint = _(b"see 'hg help evolve.interrupted'") raise error.InterventionRequired(_(b"unresolved merge conflicts"),