2603 ui.setconfig('ui', 'forcemerge', '') |
2603 ui.setconfig('ui', 'forcemerge', '') |
2604 # drop the second merge parent |
2604 # drop the second merge parent |
2605 repo.dirstate.setparents(current.node(), nullid) |
2605 repo.dirstate.setparents(current.node(), nullid) |
2606 repo.dirstate.write() |
2606 repo.dirstate.write() |
2607 # fix up dirstate for copies and renames |
2607 # fix up dirstate for copies and renames |
2608 cmdutil.duplicatecopies(repo, ctx.rev(), current.node()) |
2608 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
2609 # report any conflicts |
2609 # report any conflicts |
2610 if stats and stats[3] > 0: |
2610 if stats and stats[3] > 0: |
2611 # write out state for --continue |
2611 # write out state for --continue |
2612 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
2612 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
2613 repo.opener.write('graftstate', ''.join(nodelines)) |
2613 repo.opener.write('graftstate', ''.join(nodelines)) |