Mercurial > public > mercurial-scm > hg

diff mercurial/filemerge.py @ 11702:eb07fbc21e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 27 Jul 2010 23:40:46 +0900
parents d3c1eddfdbcf
children 8380ed691df8
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Jul 28 11:07:20 2010 +0200
+++ b/mercurial/filemerge.py	Tue Jul 27 23:40:46 2010 +0900
@@ -135,7 +135,7 @@
         except IOError:
             return False
 
-    if not fco.cmp(fcd.data()): # files identical?
+    if not fco.cmp(fcd): # files identical?
         return None
 
     if fca == fco: # backwards, use working dir parent as ancestor