diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py index fd1bb7c1be78d15a02761156bb1caaa3ccb304b6_aGdleHQvbGFyZ2VmaWxlcy9vdmVycmlkZXMucHk=..32e502b26983eaa89574835a024a9b035ad72bf4_aGdleHQvbGFyZ2VmaWxlcy9vdmVycmlkZXMucHk= 100644 --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -250,8 +250,10 @@ """ match = oldmatch(ctx, pats, opts, globbed, default) m = copy.copy(match) - standins = [lfutil.standin(f) for f in m._files] - m._files.extend(standins) + for i in range(0, len(m._files)): + standin = lfutil.standin(m._files[i]) + if standin in repo[ctx.node()]: + m._files[i] = standin m._fmap = set(m._files) m._always = False origmatchfn = m.matchfn diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t index fd1bb7c1be78d15a02761156bb1caaa3ccb304b6_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLnQ=..32e502b26983eaa89574835a024a9b035ad72bf4_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLnQ= 100644 --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -738,6 +738,8 @@ large6 $ cat sub2/large7 large7 + $ hg log -qf sub2/large7 + 7:daea875e9014 $ cd .. $ hg clone a -r 3 c adding changesets