diff mercurial/context.py @ 3352:69fe021cc23e

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Wed, 11 Oct 2006 17:37:48 -0500
parents b02e60097bbe 50a18815e3f0
children d8eba1c3ce9b cc9c31b07c2c
line wrap: on
line diff
--- a/mercurial/context.py	Wed Oct 11 23:31:05 2006 +0200
+++ b/mercurial/context.py	Wed Oct 11 17:37:48 2006 -0500
@@ -367,7 +367,8 @@
                 man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f)))
 
         for f in deleted + removed:
-            del man[f]
+            if f in man:
+                del man[f]
 
         self._manifest = man