changeset 4536 | 720ae5085ee3 |
parent 4531 | b51a8138292a |
child 4541 | 3f4555babe74 |
4535:121999244123 | 4536:720ae5085ee3 |
---|---|
808 |
808 |
809 for f in remove: |
809 for f in remove: |
810 if f in m1: |
810 if f in m1: |
811 del m1[f] |
811 del m1[f] |
812 removed.append(f) |
812 removed.append(f) |
813 elif f in m2: |
|
814 removed.append(f) |
|
813 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed)) |
815 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed)) |
814 |
816 |
815 # add changeset |
817 # add changeset |
816 new = new.keys() |
818 new = new.keys() |
817 new.sort() |
819 new.sort() |