mercurial/hg.py
changeset 416 5e9e8b8d2629
parent 415 c2b9502a4e96
child 417 f2d1f5fd0179
equal deleted inserted replaced
415:c2b9502a4e96 416:5e9e8b8d2629
   586             fp2 = m2.get(f, nullid)
   586             fp2 = m2.get(f, nullid)
   587             new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
   587             new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
   588 
   588 
   589         # update manifest
   589         # update manifest
   590         m1.update(new)
   590         m1.update(new)
   591         for f in remove: del m1[f]
   591         for f in remove:
       
   592             if f in m1:
       
   593                 del m1[f]
   592         mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0])
   594         mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0])
   593 
   595 
   594         # add changeset
   596         # add changeset
   595         new = new.keys()
   597         new = new.keys()
   596         new.sort()
   598         new.sort()