Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/context.py @ 3351:50a18815e3f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 10 Oct 2006 21:03:24 +0300
parents 6c68bc1e7873
children 69fe021cc23e
line wrap: on
line diff
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -360,7 +360,8 @@ class workingctx(changectx):
                 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