Mercurial > public > mercurial-scm > hg-stable

diff hgext/largefiles/overrides.py @ 17232:25248e2ebaee stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: ensure addlargefiles() doesn't add a standin as a largefile An easy way to force this (and cause a traceback) prior to the fix for 3507 was $ touch large $ hg add --large large $ hg ci -m "add" $ hg remove large $ touch large $ hg addremove --config largefiles.patterns=**large This patch also detected (and corrected) a previous test where a standin got added as a largefile (without a traceback).
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 19 Jul 2012 23:35:13 -0400
parents 2446b63c89ec
children 6e84171a61c8
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Thu Jul 19 11:12:05 2012 -0400
+++ b/hgext/largefiles/overrides.py	Thu Jul 19 23:35:13 2012 -0400
@@ -81,7 +81,7 @@
                 ui.warn(_('%s already a largefile\n') % f)
             continue
 
-        if exact or not exists:
+        if (exact or not exists) and not lfutil.isstandin(f):
             wfile = repo.wjoin(f)
 
             # In case the file was removed previously, but not committed