Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 416:5e9e8b8d2629
[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 |
comparison
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() |