Skip to content
Snippets Groups Projects
Commit 32e502b2 authored by Wei, Elson's avatar Wei, Elson
Browse files

largefiles: overridematch() should replace the file path instead of extending (issue3934)

parent fd1bb7c1
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment