# HG changeset patch # User Matt Mackall # Date 1165605297 21600 # Node ID 676b75547d13dc9afedac2eff207050e42346a97 # Parent 28134d82db9b79641b1d81e84c479f4272e588ac context: don't spuriously raise abort when a file goes missing. diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -384,7 +384,10 @@ class workingctx(changectx): 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: