Patchwork [2,of,3] largefiles: remove extra check for file to get - it _is_ by definition in p2

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 24, 2013, 6:34 p.m.
Message ID <593207462618527668e3.1382639680@localhost.localdomain>
Download mbox | patch
Permalink /patch/2820/
State Accepted
Commit 593207462618527668e30d3423254bafa09eb9ad
Headers show

Comments

Mads Kiilerich - Oct. 24, 2013, 6:34 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1382639110 -28800
#      Fri Oct 25 02:25:10 2013 +0800
# Branch stable
# Node ID 593207462618527668e30d3423254bafa09eb9ad
# Parent  8eb99e5cec4a014d00eafe2ac2d6fe5e0ab77d6a
largefiles: remove extra check for file to get - it _is_ by definition in p2

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -381,7 +381,7 @@  def overridemanifestmerge(origfn, repo, 
 
         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 @@  def overridemanifestmerge(origfn, repo, 
                 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)