changeset 416 | 5e9e8b8d2629 |
parent 415 | c2b9502a4e96 |
child 417 | f2d1f5fd0179 |
--- 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