comparison mercurial/commands.py @ 27025:ec37257341a9

resolve: fix incorrect merge

The merge from stable into default was semantically incomplete -- a couple of
changes in preceding code had to be rewritten here.

This code only triggers for change/delete conflicts, so we can't test it yet.
We will soon be able to do it, though.

27024:ceef5fb14872

                ui.setconfig('ui', 'forcemerge', '', 'resolve')
                ms.commit()

            # replace filemerge's .orig file with our resolve file
            a = repo.wjoin(f)
            util.rename(a + ".resolve", a + ".orig")

        ms.commit()

        if not didwork and pats:
            ui.warn(_("arguments do not match paths that need resolving\n"))

27025:ec37257341a9

                ui.setconfig('ui', 'forcemerge', '', 'resolve')
                ms.commit()

            # replace filemerge's .orig file with our resolve file
            a = repo.wjoin(f)
            try:
                util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
            except OSError as inst:
                if inst.errno != errno.ENOENT:
                    raise

        ms.commit()

        if not didwork and pats:
            ui.warn(_("arguments do not match paths that need resolving\n"))