# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-02-05 05:21:55
# Node ID ef2295651351ea16fdd968282f16b063f8f2df64
# Parent  641c8b66a825d3382cfc45267647830a7a4e9767

merge: don't unnecessarily calculate backup path

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

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