Submitter | Matt Harbison |
---|---|
Date | July 27, 2015, 10:01 p.m. |
Message ID | <ff6acf895dc1971a6e2a.1438034471@waste.org> |
Download | mbox | patch |
Permalink | /patch/10067/ |
State | Accepted |
Headers | show |
Comments
On Mon, 2015-07-27 at 17:01 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1438033149 14400 > # Mon Jul 27 17:39:09 2015 -0400 > # Branch stable > # Node ID ff6acf895dc1971a6e2aaeea0c1e0d7d8f9c1ee2 > # Parent 511e1949d55708e7eeacc8ab7874df534422e4c6 > extdiff: allow modifications in subrepos to be copied back Queued for stable, thanks. > Unfortunately, I don't see a way to create a test that modifies the file in the > temporary directory before the command exits. Point extdiff at your own "diff" script?
Patch
diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -101,12 +101,8 @@ matchfn=scmutil.matchfiles(repo, files), subrepos=listsubrepos) - ctx = repo[node] 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: