##// END OF EJS Templates
extdiff: allow modifications in subrepos to be copied back...
Matt Harbison -
r25876:415709a4 stable
parent child Browse files
Show More
@@ -101,12 +101,8 b' def snapshot(ui, repo, files, node, tmpr'
101 matchfn=scmutil.matchfiles(repo, files),
101 matchfn=scmutil.matchfiles(repo, files),
102 subrepos=listsubrepos)
102 subrepos=listsubrepos)
103
103
104 ctx = repo[node]
105 for fn in sorted(files):
104 for fn in sorted(files):
106 wfn = util.pconvert(fn)
105 wfn = util.pconvert(fn)
107 if wfn not in ctx:
108 # File doesn't exist; could be a bogus modify
109 continue
110 ui.note(' %s\n' % wfn)
106 ui.note(' %s\n' % wfn)
111
107
112 if node is None:
108 if node is None:
General Comments 0
You need to be logged in to leave comments. Login now