# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1326934865 -3600
# Node ID 93ced643068dbb56bc616df73985812c0fa8c08c
# Parent  40554705117dd5f6892b36dee2b2bfa17be99acc# Parent  91e083fab1a324c7f1813ccf3b7b4b7358aefe5c
Merge with default

diff -r 40554705117d -r 93ced643068d hgkw/keyword.py
--- a/hgkw/keyword.py	Wed Jan 18 16:46:15 2012 +0100
+++ b/hgkw/keyword.py	Thu Jan 19 02:01:05 2012 +0100
@@ -680,7 +680,8 @@
         # not make sense
         if (fctx._filerev is None and
             (self._repo._encodefilterpats or
-             kwt.match(fctx.path()) and not 'l' in fctx.flags()) or
+             kwt.match(fctx.path()) and not 'l' in fctx.flags() or
+             self.size() - 4 == fctx.size()) or
             self.size() == fctx.size()):
             return self._filelog.cmp(self._filenode, fctx.data())
         return True
diff -r 40554705117d -r 93ced643068d tests/test-keyword.t
--- a/tests/test-keyword.t	Wed Jan 18 16:46:15 2012 +0100
+++ b/tests/test-keyword.t	Thu Jan 19 02:01:05 2012 +0100
@@ -162,13 +162,31 @@
   ignore $Id$
   a
 
-Test hook execution
-
   $ diff a hooktest
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
   $ rm hooktest
 
+hg status of kw-ignored binary file starting with '\1\n'
+
+  $ printf '\1\nfoo' > i
+  $ hg -q commit -Am metasep i
+  $ hg status
+  $ printf '\1\nbar' > i
+  $ hg status
+  M i
+  $ hg -q commit -m "modify metasep" i
+  $ hg status --rev 2:3
+  M i
+  $ touch empty
+  $ hg -q commit -A -m "another file"
+  $ hg status -A --rev 3:4 i
+  C i
+
+  $ hg -q strip -n 2
+
+Test hook execution
+
 bundle
 
   $ hg bundle --base null ../kw.hg