changeset 3293 | 4546a5e31cb8 |
parent 3292 | 764688cf51e5 |
child 3294 | a2d93b186a0e |
child 3322 | a1aad25ccc3e |
--- a/mercurial/localrepo.py Sun Oct 08 19:57:45 2006 -0500 +++ b/mercurial/localrepo.py Sun Oct 08 20:18:59 2006 -0500 @@ -497,8 +497,7 @@ 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)