# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 2010-03-16 00:16:19
# Node ID d8d1b56d451916f4da0a82c456ca397565924fcb
# Parent  194342b348709f2715316a2ad469f0b9ce0c1b8a
# Parent  cfc89fecfe51b21cb26c08268ae64acd2bb0c856

merge with stable

diff --git a/mercurial/filelog.py b/mercurial/filelog.py
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -59,7 +59,7 @@ class filelog(revlog.revlog):
         """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