Show More
@@ -65,6 +65,7 b' class bundlerevlog(revlog.revlog):' | |||||
65 | cs = chunkdata['cs'] |
|
65 | cs = chunkdata['cs'] | |
66 | deltabase = chunkdata['deltabase'] |
|
66 | deltabase = chunkdata['deltabase'] | |
67 | delta = chunkdata['delta'] |
|
67 | delta = chunkdata['delta'] | |
|
68 | flags = chunkdata['flags'] | |||
68 |
|
69 | |||
69 | size = len(delta) |
|
70 | size = len(delta) | |
70 | start = bundle.tell() - size |
|
71 | start = bundle.tell() - size | |
@@ -87,7 +88,7 b' class bundlerevlog(revlog.revlog):' | |||||
87 |
|
88 | |||
88 | baserev = self.rev(deltabase) |
|
89 | baserev = self.rev(deltabase) | |
89 | # start, size, full unc. size, base (unused), link, p1, p2, node |
|
90 | # start, size, full unc. size, base (unused), link, p1, p2, node | |
90 |
e = (revlog.offset_type(start, |
|
91 | e = (revlog.offset_type(start, flags), size, -1, baserev, link, | |
91 | self.rev(p1), self.rev(p2), node) |
|
92 | self.rev(p1), self.rev(p2), node) | |
92 | self.index.insert(-1, e) |
|
93 | self.index.insert(-1, e) | |
93 | self.nodemap[node] = n |
|
94 | self.nodemap[node] = n |
@@ -188,7 +188,8 b'' | |||||
188 | 4 changesets found |
|
188 | 4 changesets found | |
189 | $ hg --config extensions.strip= strip -r 2 --no-backup --force -q |
|
189 | $ hg --config extensions.strip= strip -r 2 --no-backup --force -q | |
190 | $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' |
|
190 | $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' | |
191 | abort: integrity check failed on data/base64.i:2! |
|
191 | Traceback (most recent call last): | |
|
192 | mercurial.mpatch.mpatchError: invalid patch | |||
192 |
|
193 | |||
193 |
$ |
|
194 | $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )' | |
194 | Traceback (most recent call last): |
|
195 | Traceback (most recent call last): |
General Comments 0
You need to be logged in to leave comments.
Login now