diff -r bee4b7abcb01 -r 05257fd28591 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Aug 14 14:42:15 2006 -0500 +++ b/mercurial/localrepo.py Mon Aug 14 15:07:00 2006 -0500 @@ -668,8 +668,7 @@ def fcmp(fn, mf): t1 = self.wread(fn) - t2 = self.file(fn).read(mf.get(fn, nullid)) - return cmp(t1, t2) + return self.file(fn).cmp(mf.get(fn, nullid), t1) def mfmatches(node): change = self.changelog.read(node)