Mercurial > hg-stable

changeset 10706:d8d1b56d4519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 16 Mar 2010 01:16:19 +0100
parents 194342b34870 (current diff) cfc89fecfe51 (diff)
children 4eaf1b746499
files mercurial/filelog.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filelog.py	Tue Mar 16 01:16:04 2010 +0100
+++ b/mercurial/filelog.py	Tue Mar 16 01:16:19 2010 +0100
@@ -59,7 +59,7 @@
         """compare text with a given file revision"""
 
         # for renames, we have to go the slow way
-        if self.renamed(node):
+        if text.startswith('\1\n') or self.renamed(node):
             t2 = self.read(node)
             return t2 != text