[PATCH 1 of 3] largefiles: don't process merge actions at all when overwriting
Mads Kiilerich
mads at kiilerich.com
Thu Oct 24 13:34:39 CDT 2013
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1382635450 -28800
# Fri Oct 25 01:24:10 2013 +0800
# Branch stable
# Node ID 8eb99e5cec4a014d00eafe2ac2d6fe5e0ab77d6a
# Parent d51c4d85ec23a67292f07b3121a9353452364f6d
largefiles: don't process merge actions at all when overwriting
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -370,12 +370,13 @@ def overridemanifestmerge(origfn, repo,
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)
More information about the Mercurial-devel
mailing list