Mercurial > hg
diff hgext/eol.py @ 14866:ad6a58581ecd
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Jul 2011 16:29:28 -0500 |
parents | 5b46c16e7121 abf915f537be |
children | f97e7c378349 |
line wrap: on
line diff
--- a/hgext/eol.py Tue Jul 12 16:36:34 2011 -0500 +++ b/hgext/eol.py Wed Jul 13 16:29:28 2011 -0500 @@ -330,7 +330,10 @@ for f in sorted(ctx.added() + ctx.modified()): if not self._eolfile(f): continue - data = ctx[f].data() + try: + data = ctx[f].data() + except IOError: + continue if util.binary(data): # We should not abort here, since the user should # be able to say "** = native" to automatically