Mercurial > hg-stable

changeset 19952:8eb99e5cec4a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: don't process merge actions at all when overwriting
author Mads Kiilerich <madski@unity3d.com>
date Fri, 25 Oct 2013 01:24:10 +0800
parents d51c4d85ec23
children 593207462618
files hgext/largefiles/overrides.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Thu Oct 24 01:49:56 2013 +0800
+++ b/hgext/largefiles/overrides.py	Fri Oct 25 01:24:10 2013 +0800
@@ -370,12 +370,13 @@
     overwrite = force and not branchmerge
     actions = origfn(repo, p1, p2, pa, branchmerge, force, partial,
                      acceptremote)
+
+    if overwrite:
+        return actions
+
     processed = []
 
     for action in actions:
-        if overwrite:
-            processed.append(action)
-            continue
         f, m, args, msg = action
 
         splitstandin = lfutil.splitstandin(f)