Submitter | phabricator |
---|---|
Date | Oct. 7, 2020, 1:26 a.m. |
Message ID | <differential-rev-PHID-DREV-htrcc6faotbkbaynjbuj-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47389/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -63,11 +63,14 @@ size = len(delta) start = cgunpacker.tell() - size - link = linkmapper(cs) if self.index.has_node(node): # this can happen if two branches make the same change self.bundlerevs.add(self.index.rev(node)) continue + if cs == node: + linkrev = nullrev + else: + linkrev = linkmapper(cs) for p in (p1, p2): if not self.index.has_node(p): @@ -87,7 +90,7 @@ size, -1, baserev, - link, + linkrev, self.rev(p1), self.rev(p2), node,