Mercurial > hg

changeset 3293:4546a5e31cb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use filelog.cmp in checkfilemerge
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 20:18:59 -0500
parents 764688cf51e5
children a2d93b186a0e fa59d6763441
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)