# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1549344115 28800
# Node ID ef2295651351ea16fdd968282f16b063f8f2df64
# Parent  641c8b66a825d3382cfc45267647830a7a4e9767
merge: don't unnecessarily calculate backup path

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

diff -r 641c8b66a825 -r ef2295651351 mercurial/merge.py
--- a/mercurial/merge.py	Sun Feb 03 22:49:28 2019 -0800
+++ b/mercurial/merge.py	Mon Feb 04 21:21:55 2019 -0800
@@ -1505,8 +1505,8 @@
                         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")