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

merge: migrate to scmutil.backuppath()

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

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1506,9 +1506,8 @@ def batchget(repo, mctx, wctx, actions):
                             conflicting = p
                             break
                 if repo.wvfs.lexists(conflicting):
-                    absf = repo.wjoin(conflicting)
-                    orig = scmutil.origpath(ui, repo, absf)
-                    util.rename(absf, orig)
+                    orig = scmutil.backuppath(ui, repo, conflicting)
+                    util.rename(repo.wjoin(conflicting), orig)
             wctx[f].clearunknown()
             atomictemp = ui.configbool("experimental", "update.atomic-file")
             wctx[f].write(fctx(f).data(), flags, backgroundclose=True,