Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use filelog.cmp in checkfilemerge
authorMatt Mackall <mpm@selenic.com>
Sun, 08 Oct 2006 20:18:59 -0500
changeset 3293 4546a5e31cb8
parent 3292 764688cf51e5
child 3294 a2d93b186a0e
child 3320 fa59d6763441
Use filelog.cmp in checkfilemerge
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial