From patchwork Thu Feb  7 02:04:57 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D5858: resolve: migrate to scmutil.backuppath()
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 38512
Message-Id: <2cd03c240e1506d929869dc2cfaf7ed2@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 7 Feb 2019 02:04:57 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG31ae4129ff8a: resolve: migrate to scmutil.backuppath() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5858?vs=13863&id=13880

REVISION DETAIL
  https://phab.mercurial-scm.org/D5858

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4971,7 +4971,7 @@
                 if complete:
                     try:
                         util.rename(a + ".resolve",
-                                    scmutil.origpath(ui, repo, a))
+                                    scmutil.backuppath(ui, repo, f))
                     except OSError as inst:
                         if inst.errno != errno.ENOENT:
                             raise
@@ -4997,7 +4997,7 @@
             # replace filemerge's .orig file with our resolve file
             a = repo.wjoin(f)
             try:
-                util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
+                util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
             except OSError as inst:
                 if inst.errno != errno.ENOENT:
                     raise