Mercurial > public > mercurial-scm > hg

diff mercurial/hg.py @ 416:5e9e8b8d2629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:19:39 -0800
parents c2b9502a4e96
children f2d1f5fd0179
line wrap: on
line diff
--- a/mercurial/hg.py	Tue Jun 21 19:14:11 2005 -0800
+++ b/mercurial/hg.py	Tue Jun 21 19:19:39 2005 -0800
@@ -588,7 +588,9 @@
 
         # update manifest
         m1.update(new)
-        for f in remove: del m1[f]
+        for f in remove:
+            if f in m1:
+                del m1[f]
         mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0])
 
         # add changeset