hgext/extdiff.py
changeset 3328 49966b5ab16f
parent 3124 f145d04899d2
child 3707 67f44b825784
equal deleted inserted replaced
3299:a1aad25ccc3e 3328:49966b5ab16f
    63         os.mkdir(base)
    63         os.mkdir(base)
    64         if not ui.quiet:
    64         if not ui.quiet:
    65             ui.write_err(_('making snapshot of %d files from rev %s\n') %
    65             ui.write_err(_('making snapshot of %d files from rev %s\n') %
    66                          (len(files), short(node)))
    66                          (len(files), short(node)))
    67         for fn in files:
    67         for fn in files:
       
    68             if not fn in mf:
       
    69                 # skipping new file after a merge ?
       
    70                 continue
    68             wfn = util.pconvert(fn)
    71             wfn = util.pconvert(fn)
    69             ui.note('  %s\n' % wfn)
    72             ui.note('  %s\n' % wfn)
    70             dest = os.path.join(base, wfn)
    73             dest = os.path.join(base, wfn)
    71             destdir = os.path.dirname(dest)
    74             destdir = os.path.dirname(dest)
    72             if not os.path.isdir(destdir):
    75             if not os.path.isdir(destdir):