Show More
@@ -2311,6 +2311,9 b' class localrepository(object):' | |||||
2311 | n = fl.node(new) |
|
2311 | n = fl.node(new) | |
2312 | if n in needs: |
|
2312 | if n in needs: | |
2313 | needs.remove(n) |
|
2313 | needs.remove(n) | |
|
2314 | else: | |||
|
2315 | raise util.Abort( | |||
|
2316 | _("received spurious file revlog entry")) | |||
2314 | if not needs: |
|
2317 | if not needs: | |
2315 | del needfiles[f] |
|
2318 | del needfiles[f] | |
2316 | self.ui.progress(_('files'), None) |
|
2319 | self.ui.progress(_('files'), None) |
@@ -18,7 +18,48 b'' | |||||
18 | updating to branch default |
|
18 | updating to branch default | |
19 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 |
|
20 | |||
|
21 | Test spurious filelog entries: | |||
|
22 | ||||
21 | $ cd test-clone |
|
23 | $ cd test-clone | |
|
24 | $ echo blah >> beta | |||
|
25 | $ cp .hg/store/data/beta.i tmp1 | |||
|
26 | $ hg ci -m 2 | |||
|
27 | $ cp .hg/store/data/beta.i tmp2 | |||
|
28 | $ hg -q rollback | |||
|
29 | $ mv tmp2 .hg/store/data/beta.i | |||
|
30 | $ echo blah >> beta | |||
|
31 | $ hg ci -m '2 (corrupt)' | |||
|
32 | ||||
|
33 | Expected to fail: | |||
|
34 | ||||
|
35 | $ hg verify | |||
|
36 | checking changesets | |||
|
37 | checking manifests | |||
|
38 | crosschecking files in changesets and manifests | |||
|
39 | checking files | |||
|
40 | beta@1: dddc47b3ba30 not in manifests | |||
|
41 | 2 files, 2 changesets, 4 total revisions | |||
|
42 | 1 integrity errors encountered! | |||
|
43 | (first damaged changeset appears to be 1) | |||
|
44 | [1] | |||
|
45 | ||||
|
46 | $ hg push | |||
|
47 | pushing to $TESTTMP/test | |||
|
48 | searching for changes | |||
|
49 | adding changesets | |||
|
50 | adding manifests | |||
|
51 | adding file changes | |||
|
52 | transaction abort! | |||
|
53 | rollback completed | |||
|
54 | abort: received spurious file revlog entry | |||
|
55 | [255] | |||
|
56 | ||||
|
57 | $ hg -q rollback | |||
|
58 | $ mv tmp1 .hg/store/data/beta.i | |||
|
59 | $ echo beta > beta | |||
|
60 | ||||
|
61 | Test missing filelog entries: | |||
|
62 | ||||
22 | $ cp .hg/store/data/beta.i tmp |
|
63 | $ cp .hg/store/data/beta.i tmp | |
23 | $ echo blah >> beta |
|
64 | $ echo blah >> beta | |
24 | $ hg ci -m '2 (corrupt)' |
|
65 | $ hg ci -m '2 (corrupt)' | |
@@ -37,8 +78,6 b' Expected to fail:' | |||||
37 | (first damaged changeset appears to be 1) |
|
78 | (first damaged changeset appears to be 1) | |
38 | [1] |
|
79 | [1] | |
39 |
|
80 | |||
40 | Expected to fail: |
|
|||
41 |
|
||||
42 | $ hg push |
|
81 | $ hg push | |
43 | pushing to $TESTTMP/test (glob) |
|
82 | pushing to $TESTTMP/test (glob) | |
44 | searching for changes |
|
83 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now