equal
deleted
inserted
replaced
64 start = cgunpacker.tell() - size |
64 start = cgunpacker.tell() - size |
65 |
65 |
66 link = linkmapper(cs) |
66 link = linkmapper(cs) |
67 if self.index.has_node(node): |
67 if self.index.has_node(node): |
68 # this can happen if two branches make the same change |
68 # this can happen if two branches make the same change |
69 self.bundlerevs.add(self.nodemap[node]) |
69 self.bundlerevs.add(self.index.rev(node)) |
70 continue |
70 continue |
71 |
71 |
72 for p in (p1, p2): |
72 for p in (p1, p2): |
73 if not self.index.has_node(p): |
73 if not self.index.has_node(p): |
74 raise error.LookupError( |
74 raise error.LookupError( |