Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/extdiff.py @ 3328:49966b5ab16f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:35:09 +0200
parents f145d04899d2
children 67f44b825784
line wrap: on
line diff
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -65,6 +65,9 @@ def dodiff(ui, repo, diffcmd, diffopts, 
             ui.write_err(_('making snapshot of %d files from rev %s\n') %
                          (len(files), short(node)))
         for fn in files:
+            if not fn in mf:
+                # skipping new file after a merge ?
+                continue
             wfn = util.pconvert(fn)
             ui.note('  %s\n' % wfn)
             dest = os.path.join(base, wfn)