Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with cmason
authorMatt Mackall <mpm@selenic.com>
Thu, 20 Apr 2006 12:12:03 -0500
changeset 2105 21cf3fe64e27
parent 2100 2b8f887b2d1d (current diff)
parent 2101 c6c019fd5db1 (diff)
child 2106 b03de24ee2ec
Merge with cmason
--- a/mercurial/bundlerepo.py	Wed Apr 19 21:39:51 2006 +0200
+++ b/mercurial/bundlerepo.py	Thu Apr 20 12:12:03 2006 -0500
@@ -59,7 +59,11 @@
             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
mercurial