# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1145553234 18000
# Node ID b03de24ee2eca0b2014e8b1e6f69a7e48ef5aad8
# Parent  21cf3fe64e275c26b042d6e61511a043a88e9b61# Parent  f1085d34d20dd2d1b4938401a52d8099a58786d8
Merge with crew



diff -r f1085d34d20d -r b03de24ee2ec mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py	Thu Apr 20 16:33:49 2006 +0200
+++ b/mercurial/bundlerepo.py	Thu Apr 20 12:13:54 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