641 rctx = scmutil.revsingle(repo, hex(parent)) |
641 rctx = scmutil.revsingle(repo, hex(parent)) |
642 if not opts.get('merge') and op1 != node: |
642 if not opts.get('merge') and op1 != node: |
643 with dirstateguard.dirstateguard(repo, 'backout'): |
643 with dirstateguard.dirstateguard(repo, 'backout'): |
644 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
644 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
645 with ui.configoverride(overrides, 'backout'): |
645 with ui.configoverride(overrides, 'backout'): |
646 stats = mergemod.update(repo, parent, True, True, node, False) |
646 stats = mergemod.update(repo, parent, branchmerge=True, |
|
647 force=True, ancestor=node, |
|
648 mergeancestor=False) |
647 repo.setparents(op1, op2) |
649 repo.setparents(op1, op2) |
648 hg._showstats(repo, stats) |
650 hg._showstats(repo, stats) |
649 if stats.unresolvedcount: |
651 if stats.unresolvedcount: |
650 repo.ui.status(_("use 'hg resolve' to retry unresolved " |
652 repo.ui.status(_("use 'hg resolve' to retry unresolved " |
651 "file merges\n")) |
653 "file merges\n")) |