Mercurial > hg > mercurial-crew-with-dirclash
changeset 2105:21cf3fe64e27
Merge with cmason
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 Apr 2006 12:12:03 -0500 |
parents | 2b8f887b2d1d (current diff) c6c019fd5db1 (diff) |
children | b03de24ee2ec |
files | |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -59,7 +59,11 @@ class bundlerevlog(revlog.revlog): if not prev: prev = p1 # start, size, base is not used, link, p1, p2, delta ref - e = (start, size, None, link, p1, p2, node) + if self.version == 0: + e = (start, size, None, link, p1, p2, node) + else: + e = (self.offset_type(start, 0), size, -1, None, link, + self.rev(p1), self.rev(p2), node) self.basemap[n] = prev self.index.append(e) self.nodemap[node] = n