author | Mads Kiilerich <madski@unity3d.com> |
Fri, 25 Oct 2013 01:24:10 +0800 | |
branch | stable |
changeset 19952 | 8eb99e5cec4a |
parent 19951 | d51c4d85ec23 |
child 19953 | 593207462618 |
--- 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)