# HG changeset patch
# User Na'Tosha Bard <natosha@unity3d.com>
# Date 1326739535 -3600
# Node ID 634d49a8b6db9f4df070681b3f1112f00c6bc721
# Parent  7d28d6a67dd32d90427ca4d66032bc56454e3f26
largefiles: correctly handle newly added largefile on other side of merge

diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py
+++ b/hgext/largefiles/lfcommands.py
@@ -379,7 +379,8 @@
         # working copy to have the correct hashvalue.  This is because the
         # original hg.merge() already updated the standin as part of the normal
         # merge process -- we just have to udpate the largefile to match.
-        if getattr(repo, "_ismerging", False):
+        if (getattr(repo, "_ismerging", False) and
+             os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
             expectedhash = lfutil.readstandin(repo, lfile)
         else:
             expectedhash = repo[node][lfutil.standin(lfile)].data().strip()