Show More
@@ -49,7 +49,7 b' class unionrevlog(revlog.revlog):' | |||
|
49 | 49 | for rev2 in self.revlog2: |
|
50 | 50 | rev = self.revlog2.index[rev2] |
|
51 | 51 | # rev numbers - in revlog2, very different from self.rev |
|
52 |
_start, _csize, |
|
|
52 | _start, _csize, rsize, base, linkrev, p1rev, p2rev, node = rev | |
|
53 | 53 | flags = _start & 0xFFFF |
|
54 | 54 | |
|
55 | 55 | if linkmapper is None: # link is to same revlog |
@@ -69,7 +69,9 b' class unionrevlog(revlog.revlog):' | |||
|
69 | 69 | p1node = self.revlog2.node(p1rev) |
|
70 | 70 | p2node = self.revlog2.node(p2rev) |
|
71 | 71 | |
|
72 | e = (flags, None, None, base, | |
|
72 | # TODO: it's probably wrong to set compressed length to None, but | |
|
73 | # I have no idea if csize is valid in the base revlog context. | |
|
74 | e = (flags, None, rsize, base, | |
|
73 | 75 | link, self.rev(p1node), self.rev(p2node), node) |
|
74 | 76 | self.index.insert(-1, e) |
|
75 | 77 | self.nodemap[node] = n |
General Comments 0
You need to be logged in to leave comments.
Login now