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