equal
deleted
inserted
replaced
732 |
732 |
733 extra = ctx.extra().copy() |
733 extra = ctx.extra().copy() |
734 extra[b'fix_source'] = ctx.hex() |
734 extra[b'fix_source'] = ctx.hex() |
735 |
735 |
736 wctx = context.overlayworkingctx(repo) |
736 wctx = context.overlayworkingctx(repo) |
737 newp1ctx = repo[newp1node] |
737 wctx.setbase(repo[newp1node]) |
738 wctx.setbase(newp1ctx) |
|
739 merge.update( |
738 merge.update( |
740 repo, |
739 repo, |
741 ctx.rev(), |
740 ctx.rev(), |
742 branchmerge=False, |
741 branchmerge=False, |
743 force=True, |
742 force=True, |
744 ancestor=p1rev, |
743 ancestor=p1rev, |
745 mergeancestor=False, |
744 mergeancestor=False, |
746 wc=wctx, |
745 wc=wctx, |
747 ) |
746 ) |
748 copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=newp1ctx) |
747 copies.graftcopies(wctx, ctx, ctx.p1()) |
749 |
748 |
750 for path in filedata.keys(): |
749 for path in filedata.keys(): |
751 fctx = ctx[path] |
750 fctx = ctx[path] |
752 copysource = fctx.copysource() |
751 copysource = fctx.copysource() |
753 wctx.write(path, filedata[path], flags=fctx.flags()) |
752 wctx.write(path, filedata[path], flags=fctx.flags()) |