hgext/largefiles/overrides.py
branchstable
changeset 23976 344939126579
parent 23893 f21a0d6d6efd
child 24006 42fa7eeb858e
child 24158 d414c28db84d
--- a/hgext/largefiles/overrides.py	Fri Jan 30 21:11:02 2015 +0000
+++ b/hgext/largefiles/overrides.py	Fri Jan 30 20:44:11 2015 -0500
@@ -316,9 +316,14 @@
 
         for i in range(0, len(m._files)):
             standin = lfutil.standin(m._files[i])
+            # If the "standin" is a directory, append instead of replace to
+            # support naming a directory on the command line with only
+            # largefiles.  The original directory is kept to support normal
+            # files.
             if standin in repo[ctx.node()]:
                 m._files[i] = standin
-            elif m._files[i] not in repo[ctx.node()]:
+            elif m._files[i] not in repo[ctx.node()] \
+                    and repo.wvfs.isdir(standin):
                 m._files.append(standin)
             pats.add(standin)