equal
deleted
inserted
replaced
422 # remember what we've added so that we can later calculate |
422 # remember what we've added so that we can later calculate |
423 # the files to pull from a set of changesets |
423 # the files to pull from a set of changesets |
424 changed.append(f) |
424 changed.append(f) |
425 |
425 |
426 # update manifest |
426 # update manifest |
|
427 m1 = m1.copy() |
427 m1.update(new) |
428 m1.update(new) |
428 for f in remove: |
429 for f in remove: |
429 if f in m1: |
430 if f in m1: |
430 del m1[f] |
431 del m1[f] |
431 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0], |
432 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0], |
1383 m1n = self.changelog.read(p1)[0] |
1384 m1n = self.changelog.read(p1)[0] |
1384 m2n = self.changelog.read(p2)[0] |
1385 m2n = self.changelog.read(p2)[0] |
1385 man = self.manifest.ancestor(m1n, m2n) |
1386 man = self.manifest.ancestor(m1n, m2n) |
1386 m1 = self.manifest.read(m1n) |
1387 m1 = self.manifest.read(m1n) |
1387 mf1 = self.manifest.readflags(m1n) |
1388 mf1 = self.manifest.readflags(m1n) |
1388 m2 = self.manifest.read(m2n) |
1389 m2 = self.manifest.read(m2n).copy() |
1389 mf2 = self.manifest.readflags(m2n) |
1390 mf2 = self.manifest.readflags(m2n) |
1390 ma = self.manifest.read(man) |
1391 ma = self.manifest.read(man) |
1391 mfa = self.manifest.readflags(man) |
1392 mfa = self.manifest.readflags(man) |
1392 |
1393 |
1393 modified, added, removed, deleted, unknown = self.changes() |
1394 modified, added, removed, deleted, unknown = self.changes() |