Mercurial > public > mercurial-scm > hg-stable
diff hgext/extdiff.py @ 14024:92b768e9f80c
merge with stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Apr 2011 11:10:11 +0200 |
parents | d13913355390 3eb632d9cf42 |
children | 1c38777f7b8a |
line wrap: on
line diff
--- a/hgext/extdiff.py Fri Apr 29 09:43:21 2011 +0200 +++ b/hgext/extdiff.py Fri Apr 29 11:10:11 2011 +0200 @@ -100,7 +100,8 @@ if 'x' in fctx.flags(): util.set_flags(dest, False, True) if node is None: - fns_and_mtime.append((dest, repo.wjoin(fn), os.path.getmtime(dest))) + fns_and_mtime.append((dest, repo.wjoin(fn), + os.lstat(dest).st_mtime)) return dirname, fns_and_mtime def dodiff(ui, repo, diffcmd, diffopts, pats, opts): @@ -222,7 +223,7 @@ util.system(cmdline, cwd=tmproot) for copy_fn, working_fn, mtime in fns_and_mtime: - if os.path.getmtime(copy_fn) != mtime: + if os.lstat(copy_fn).st_mtime != mtime: ui.debug('file changed while diffing. ' 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) util.copyfile(copy_fn, working_fn)