Mercurial > evolve
changeset 6142:94bf0768040a
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().
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 09:24:11 +0300 |
| parents | d5759f574fd9 |
| children | 11a3ec836a65 |
| files | hgext3rd/evolve/cmdrewrite.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)