# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-02-05 05:31:18
# Node ID 31ae4129ff8a782b00fc60d5db58ca29e5abc539
# Parent  8c8121c3dfccfddc943828b2480aa6c04aceecf3

resolve: migrate to scmutil.backuppath()

Differential Revision: https://phab.mercurial-scm.org/D5858

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4971,7 +4971,7 @@ def resolve(ui, repo, *pats, **opts):
                 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 @@ def resolve(ui, repo, *pats, **opts):
             # 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