author | Matt Mackall <mpm@selenic.com> |
Sun, 08 Oct 2006 20:18:59 -0500 | |
changeset 3296 | 4546a5e31cb8 |
parent 3295 | 764688cf51e5 |
child 3297 | fa59d6763441 |
child 3300 | a2d93b186a0e |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -497,8 +497,7 @@ class localrepository(repo.repository): fp2 = nullid # is the file unmodified from the parent? report existing entry - # fixme: use filelog.cmp() - if fp2 == nullid and text == filelog.read(fp1): + if fp2 == nullid and not filelog.cmp(fp1, text): return (fp1, None, None, {}) return (None, fp1, fp2, meta)