comparison mercurial/filelog.py @ 10706:d8d1b56d4519

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 16 Mar 2010 01:16:19 +0100
parents 194342b34870 cfc89fecfe51
children a463e3c50212
comparison
equal deleted inserted replaced
10705:194342b34870 10706:d8d1b56d4519
57 57
58 def cmp(self, node, text): 58 def cmp(self, node, text):
59 """compare text with a given file revision""" 59 """compare text with a given file revision"""
60 60
61 # for renames, we have to go the slow way 61 # for renames, we have to go the slow way
62 if self.renamed(node): 62 if text.startswith('\1\n') or self.renamed(node):
63 t2 = self.read(node) 63 t2 = self.read(node)
64 return t2 != text 64 return t2 != text
65 65
66 return revlog.revlog.cmp(self, node, text) 66 return revlog.revlog.cmp(self, node, text)