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, _rsize, |
|
|
52 | _start, _csize, _rsize, base, linkrev, p1rev, p2rev, node = rev | |
|
53 | 53 | |
|
54 | 54 | if linkmapper is None: # link is to same revlog |
|
55 | 55 | assert linkrev == rev2 # we never link back |
@@ -57,6 +57,9 b' class unionrevlog(revlog.revlog):' | |||
|
57 | 57 | else: # rev must be mapped from repo2 cl to unified cl by linkmapper |
|
58 | 58 | link = linkmapper(linkrev) |
|
59 | 59 | |
|
60 | if linkmapper is not None: # link is to same revlog | |
|
61 | base = linkmapper(base) | |
|
62 | ||
|
60 | 63 | if node in self.nodemap: |
|
61 | 64 | # this happens for the common revlog revisions |
|
62 | 65 | self.bundlerevs.add(self.nodemap[node]) |
@@ -65,7 +68,7 b' class unionrevlog(revlog.revlog):' | |||
|
65 | 68 | p1node = self.revlog2.node(p1rev) |
|
66 | 69 | p2node = self.revlog2.node(p2rev) |
|
67 | 70 | |
|
68 |
e = (None, None, None, |
|
|
71 | e = (None, None, None, base, | |
|
69 | 72 | link, self.rev(p1node), self.rev(p2node), node) |
|
70 | 73 | self.index.insert(-1, e) |
|
71 | 74 | self.nodemap[node] = n |
General Comments 0
You need to be logged in to leave comments.
Login now