comparison mercurial/commands.py @ 17045:52ea9ce5b641 stable

graft: don't drop the second parent on unsuccessful merge (issue3498)

This replicates the strategy of rebase, which postpones setparents and
duplicatecopies after checking the merge stats.

Without the second parent, resolve cannot redo merge.

17041:86a3bb9c5f5c

                    repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                    stats = mergemod.update(repo, ctx.node(), True, True, False,
                                            ctx.p1().node())
                finally:
                    repo.ui.setconfig('ui', 'forcemerge', '')
                # drop the second merge parent
                repo.setparents(current.node(), nullid)
                repo.dirstate.write()
                # fix up dirstate for copies and renames
                cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
                # report any conflicts
                if stats and stats[3] > 0:
                    # write out state for --continue
                    nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
                    repo.opener.write('graftstate', ''.join(nodelines))
                    raise util.Abort(
                        _("unresolved conflicts, can't continue"),
                        hint=_('use hg resolve and hg graft --continue'))
            else:
                cont = False

            # commit
            source = ctx.extra().get('source')
            if not source:
                source = ctx.hex()

17045:52ea9ce5b641

                    repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                    stats = mergemod.update(repo, ctx.node(), True, True, False,
                                            ctx.p1().node())
                finally:
                    repo.ui.setconfig('ui', 'forcemerge', '')
                # report any conflicts
                if stats and stats[3] > 0:
                    # write out state for --continue
                    nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
                    repo.opener.write('graftstate', ''.join(nodelines))
                    raise util.Abort(
                        _("unresolved conflicts, can't continue"),
                        hint=_('use hg resolve and hg graft --continue'))
            else:
                cont = False

            # drop the second merge parent
            repo.setparents(current.node(), nullid)
            repo.dirstate.write()
            # fix up dirstate for copies and renames
            cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())

            # commit
            source = ctx.extra().get('source')
            if not source:
                source = ctx.hex()