Skip to content
Snippets Groups Projects
Commit 415709a4 authored by Matt Harbison's avatar Matt Harbison
Browse files

extdiff: allow modifications in subrepos to be copied back

This check was a legacy bit from when the file data was being fetched manually
with 'ctx[wfn]', but archive() does that now.  49966b5ab16f seems to indicate
that this avoided a problem where a merge adds a file to another branch, and
that test still passes.

Unfortunately, I don't see a way to create a test that modifies the file in the
temporary directory before the command exits.

I wonder if the os.lstat() call needs to be wrapped in an exception handler for
the case where archive didn't create a file because the file didn't exist in
that revision.  But I wasn't able to trigger a problem without it on a real
repository.
parent 511e1949
No related branches found
No related tags found
No related merge requests found
......@@ -101,6 +101,5 @@
matchfn=scmutil.matchfiles(repo, files),
subrepos=listsubrepos)
ctx = repo[node]
for fn in sorted(files):
wfn = util.pconvert(fn)
......@@ -105,8 +104,5 @@
for fn in sorted(files):
wfn = util.pconvert(fn)
if wfn not in ctx:
# File doesn't exist; could be a bogus modify
continue
ui.note(' %s\n' % wfn)
if node is None:
......
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