branch | stable |
changeset 15871 | 07893690c435 |
parent 15387 | 87248de09135 |
child 16686 | 67964cda8701 |
--- a/hgext/keyword.py Wed Jan 11 16:54:29 2012 +0000 +++ b/hgext/keyword.py Sun Jan 15 13:37:33 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