Show More
@@ -424,6 +424,7 b' class localrepository(object):' | |||
|
424 | 424 | changed.append(f) |
|
425 | 425 | |
|
426 | 426 | # update manifest |
|
427 | m1 = m1.copy() | |
|
427 | 428 | m1.update(new) |
|
428 | 429 | for f in remove: |
|
429 | 430 | if f in m1: |
@@ -1385,7 +1386,7 b' class localrepository(object):' | |||
|
1385 | 1386 | man = self.manifest.ancestor(m1n, m2n) |
|
1386 | 1387 | m1 = self.manifest.read(m1n) |
|
1387 | 1388 | mf1 = self.manifest.readflags(m1n) |
|
1388 | m2 = self.manifest.read(m2n) | |
|
1389 | m2 = self.manifest.read(m2n).copy() | |
|
1389 | 1390 | mf2 = self.manifest.readflags(m2n) |
|
1390 | 1391 | ma = self.manifest.read(man) |
|
1391 | 1392 | mfa = self.manifest.readflags(man) |
General Comments 0
You need to be logged in to leave comments.
Login now