Mercurial > hg

changeset 19953:593207462618 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: remove extra check for file to get - it _is_ by definition in p2
author Mads Kiilerich <madski@unity3d.com>
date Fri, 25 Oct 2013 02:25:10 +0800
parents 8eb99e5cec4a
children 427ce5633c1c
files hgext/largefiles/overrides.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Fri Oct 25 01:24:10 2013 +0800
+++ b/hgext/largefiles/overrides.py	Fri Oct 25 02:25:10 2013 +0800
@@ -381,7 +381,7 @@
 
         splitstandin = lfutil.splitstandin(f)
         if (m == "g" and splitstandin is not None and
-            splitstandin in p1 and f in p2):
+            splitstandin in p1):
             # Case 1: normal file in the working copy, largefile in
             # the second parent
             lfile = splitstandin
@@ -394,7 +394,7 @@
                 processed.append((standin, "g", (p2.flags(standin),), msg))
             else:
                 processed.append((standin, "r", None, msg))
-        elif m == "g" and lfutil.standin(f) in p1 and f in p2:
+        elif m == "g" and lfutil.standin(f) in p1:
             # Case 2: largefile in the working copy, normal file in
             # the second parent
             standin = lfutil.standin(f)