changeset 43613 | f212cc5ffceb |
parent 43581 | 642433629e20 |
child 45811 | a5206e71c536 |
--- a/mercurial/unionrepo.py Sat Nov 09 13:23:53 2019 +0100 +++ b/mercurial/unionrepo.py Sat Nov 09 13:23:52 2019 +0100 @@ -62,9 +62,10 @@ if linkmapper is not None: # link is to same revlog base = linkmapper(base) - if node in self.nodemap: + this_rev = self.index.get_rev(node) + if this_rev is not None: # this happens for the common revlog revisions - self.bundlerevs.add(self.nodemap[node]) + self.bundlerevs.add(this_rev) continue p1node = self.revlog2.node(p1rev)