--- a/hgext/largefiles/overrides.py Tue Mar 24 10:27:56 2015 -0700
+++ b/hgext/largefiles/overrides.py Mon Mar 23 23:04:51 2015 -0700
@@ -765,7 +765,7 @@
def tostandin(f):
standin = lfutil.standin(f)
- if standin in mctx:
+ if standin in ctx or standin in mctx:
return standin
elif standin in repo[None] or lfdirstate[f] == 'r':
return None
@@ -777,7 +777,7 @@
def matchfn(f):
if lfutil.isstandin(f):
return (origmatchfn(lfutil.splitstandin(f)) and
- (f in repo[None] or f in mctx))
+ (f in ctx or f in mctx))
return origmatchfn(f)
m.matchfn = matchfn
return m