Show More
@@ -686,8 +686,7 b' class localrepository:' | |||||
686 | self.dirstate.forget(remove) |
|
686 | self.dirstate.forget(remove) | |
687 |
|
687 | |||
688 | def changes(self, node1, node2, files=None): |
|
688 | def changes(self, node1, node2, files=None): | |
689 | # changed, added, deleted, unknown |
|
689 | mf2, u = None, [] | |
690 | c, a, d, u, mf2 = [], [], [], [], None |
|
|||
691 |
|
690 | |||
692 | def fcmp(fn, mf): |
|
691 | def fcmp(fn, mf): | |
693 | t1 = self.wfile(fn).read() |
|
692 | t1 = self.wfile(fn).read() | |
@@ -727,6 +726,9 b' class localrepository:' | |||||
727 | change = self.changelog.read(node2) |
|
726 | change = self.changelog.read(node2) | |
728 | mf2 = self.manifest.read(change[0]) |
|
727 | mf2 = self.manifest.read(change[0]) | |
729 |
|
728 | |||
|
729 | # flush lists from dirstate before comparing manifests | |||
|
730 | c, a = [], [] | |||
|
731 | ||||
730 | change = self.changelog.read(node1) |
|
732 | change = self.changelog.read(node1) | |
731 | mf1 = self.manifest.read(change[0]).copy() |
|
733 | mf1 = self.manifest.read(change[0]).copy() | |
732 |
|
734 |
General Comments 0
You need to be logged in to leave comments.
Login now