Show More
@@ -63,11 +63,14 b' class bundlerevlog(revlog.revlog):' | |||||
63 | size = len(delta) |
|
63 | size = len(delta) | |
64 | start = cgunpacker.tell() - size |
|
64 | start = cgunpacker.tell() - size | |
65 |
|
65 | |||
66 | link = linkmapper(cs) |
|
|||
67 | if self.index.has_node(node): |
|
66 | if self.index.has_node(node): | |
68 | # this can happen if two branches make the same change |
|
67 | # this can happen if two branches make the same change | |
69 | self.bundlerevs.add(self.index.rev(node)) |
|
68 | self.bundlerevs.add(self.index.rev(node)) | |
70 | continue |
|
69 | continue | |
|
70 | if cs == node: | |||
|
71 | linkrev = nullrev | |||
|
72 | else: | |||
|
73 | linkrev = linkmapper(cs) | |||
71 |
|
74 | |||
72 | for p in (p1, p2): |
|
75 | for p in (p1, p2): | |
73 | if not self.index.has_node(p): |
|
76 | if not self.index.has_node(p): | |
@@ -87,7 +90,7 b' class bundlerevlog(revlog.revlog):' | |||||
87 | size, |
|
90 | size, | |
88 | -1, |
|
91 | -1, | |
89 | baserev, |
|
92 | baserev, | |
90 | link, |
|
93 | linkrev, | |
91 | self.rev(p1), |
|
94 | self.rev(p1), | |
92 | self.rev(p2), |
|
95 | self.rev(p2), | |
93 | node, |
|
96 | node, |
General Comments 0
You need to be logged in to leave comments.
Login now