Mercurial > hg-stable
changeset 3823:676b75547d13
context: don't spuriously raise abort when a file goes missing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 08 Dec 2006 13:14:57 -0600 |
parents | 28134d82db9b |
children | 531c116b2028 08c169cbd9e1 |
files | mercurial/context.py |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Fri Dec 08 13:04:10 2006 -0600 +++ b/mercurial/context.py Fri Dec 08 13:14:57 2006 -0600 @@ -384,7 +384,10 @@ for i, l in (("a", added), ("m", modified), ("u", unknown)): for f in l: man[f] = man.get(copied.get(f, f), nullid) + i - man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) + try: + man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) + except OSError: + pass for f in deleted + removed: if f in man: