Mercurial > hg
annotate tests/test-issue6528.t @ 49762:c4d587fa161c
peer: pass the `path` to the statichttp peer
We now have all peer able to receive and store a `path` object. Hooray.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 02 Dec 2022 19:34:01 +0100 |
parents | 58e38c1a2370 |
children | 85c5b4b507af |
rev | line source |
---|---|
47503
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 =============================================================== |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 Test non-regression on the corruption associated with issue6528 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 =============================================================== |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 Setup |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
6 ===== |
47503
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 $ hg init base-repo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 $ cd base-repo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 $ cat <<EOF > a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 > 1 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 > 2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 > 3 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 > 4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 > 5 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 > 6 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 > EOF |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 $ hg add a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 $ hg commit -m 'c_base_c - create a.txt' |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 Modify a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 $ sed -e 's/1/foo/' a.txt > a.tmp; mv a.tmp a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 $ hg commit -m 'c_modify_c - modify a.txt' |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 Modify and rename a.txt to b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 $ hg up -r "desc('c_base_c')" |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 $ sed -e 's/6/bar/' a.txt > a.tmp; mv a.tmp a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 $ hg mv a.txt b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 $ hg commit -m 'c_rename_c - rename and modify a.txt to b.txt' |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 created new head |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 Merge each branch |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 $ hg merge -r "desc('c_modify_c')" |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 merging b.txt and a.txt to b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 (branch merge, don't forget to commit) |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 $ hg commit -m 'c_merge_c: commit merge' |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 $ hg debugrevlogindex b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 rev linkrev nodeid p1 p2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 0 2 05b806ebe5ea 000000000000 000000000000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 Check commit Graph |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 $ hg log -G |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 @ changeset: 3:a1cc2bdca0aa |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 |\ tag: tip |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
55 | | parent: 2:615c6ccefd15 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 | | parent: 1:373d507f4667 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 | | user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 | | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 | | summary: c_merge_c: commit merge |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 | | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 | o changeset: 2:615c6ccefd15 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 | | parent: 0:f5a5a568022f |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 | | user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
64 | | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 | | summary: c_rename_c - rename and modify a.txt to b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
66 | | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
67 o | changeset: 1:373d507f4667 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
68 |/ user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 | summary: c_modify_c - modify a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 o changeset: 0:f5a5a568022f |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 summary: c_base_c - create a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 $ hg cat -r . b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 foo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
81 3 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 5 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
84 bar |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 $ cat b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 foo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 3 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
90 5 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 bar |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 $ cd .. |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
93 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
95 Check the lack of corruption |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
96 ============================ |
47503
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
98 $ hg clone --pull base-repo cloned |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
99 requesting all changes |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
100 adding changesets |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 adding manifests |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
102 adding file changes |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
103 added 4 changesets with 4 changes to 2 files |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
104 new changesets f5a5a568022f:a1cc2bdca0aa |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
105 updating to branch default |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
107 $ cd cloned |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
108 $ hg up -r "desc('c_merge_c')" |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
109 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
110 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
111 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
112 Status is buggy, even with debugrebuilddirstate |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
113 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
114 $ hg cat -r . b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
115 foo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
116 2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
117 3 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
118 4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
119 5 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
120 bar |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
121 $ cat b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
122 foo |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
123 2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
124 3 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 4 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
126 5 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
127 bar |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
128 $ hg status |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
129 $ hg debugrebuilddirstate |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
130 $ hg status |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
131 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
132 the history was altered |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
133 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
134 in theory p1/p2 order does not matter but in practice p1 == nullid is used as a |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
135 marker that some metadata are present and should be fetched. |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 $ hg debugrevlogindex b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 rev linkrev nodeid p1 p2 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
139 0 2 05b806ebe5ea 000000000000 000000000000 |
47504
411dc27fd9fd
corruption: backout changeset 49fd21f32695 (issue6528)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47503
diff
changeset
|
140 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
47503
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 Check commit Graph |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
143 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
144 $ hg log -G |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
145 @ changeset: 3:a1cc2bdca0aa |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
146 |\ tag: tip |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 | | parent: 2:615c6ccefd15 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
148 | | parent: 1:373d507f4667 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
149 | | user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 | | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
151 | | summary: c_merge_c: commit merge |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
152 | | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 | o changeset: 2:615c6ccefd15 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
154 | | parent: 0:f5a5a568022f |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 | | user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
156 | | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
157 | | summary: c_rename_c - rename and modify a.txt to b.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
158 | | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
159 o | changeset: 1:373d507f4667 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
160 |/ user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
161 | date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 | summary: c_modify_c - modify a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
163 | |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
164 o changeset: 0:f5a5a568022f |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
165 user: test |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
166 date: Thu Jan 01 00:00:00 1970 +0000 |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
167 summary: c_base_c - create a.txt |
bd0a2a919bf8
corruption: add a test for issue6528
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
169 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
170 Test the command that fixes the issue |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
171 ===================================== |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
172 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
173 Restore a broken repository with multiple broken revisions and a filename that |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
174 would get encoded to test the `report` options. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
175 It's a tarball because unbundle might magically fix the issue later. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
176 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
177 $ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
178 $ mkdir repo-to-fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
179 $ cd repo-to-fix |
49486
58e38c1a2370
tests: fix tar invocation, to address issue 6740
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49458
diff
changeset
|
180 $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
181 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
182 Check that the issue is present |
48470
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48335
diff
changeset
|
183 (It is currently not present with rhg but will be when optimizations are added |
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48335
diff
changeset
|
184 to resolve ambiguous files at the end of status without reading their content |
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48335
diff
changeset
|
185 if the size differs, and reading the expected size without resolving filelog |
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48335
diff
changeset
|
186 deltas where possible.) |
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48335
diff
changeset
|
187 |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
188 $ hg st |
48546
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
189 M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
190 M b.txt |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
191 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
192 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
193 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
194 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
195 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
196 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
197 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
198 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
199 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
200 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
201 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
202 Dry-run the fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
203 $ hg debug-repair-issue6528 --dry-run |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
204 found affected revision 1 for filelog 'data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
205 found affected revision 1 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
206 found affected revision 3 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
207 $ hg st |
48546
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
208 M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
209 M b.txt |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
210 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
211 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
212 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
213 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
214 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
215 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
216 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
217 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
218 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
219 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
220 |
47817
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
221 Test the --paranoid option |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
222 $ hg debug-repair-issue6528 --dry-run --paranoid |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
223 found affected revision 1 for filelog 'data/D.txt.i' |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
224 found affected revision 1 for filelog 'data/b.txt.i' |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
225 found affected revision 3 for filelog 'data/b.txt.i' |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
226 $ hg st |
48546
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
227 M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
228 M b.txt |
47817
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
229 $ hg debugrevlogindex b.txt |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
230 rev linkrev nodeid p1 p2 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
231 0 2 05b806ebe5ea 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
232 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
233 2 6 216a5fe8b8ed 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
234 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
235 $ hg debugrevlogindex D.txt |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
236 rev linkrev nodeid p1 p2 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
237 0 6 2a8d3833f2fb 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
238 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47815
diff
changeset
|
239 |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
240 Run the fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
241 $ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
242 found affected revision 1 for filelog 'data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
243 repaired revision 1 of 'filelog data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
244 found affected revision 1 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
245 found affected revision 3 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
246 repaired revision 1 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
247 repaired revision 3 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
248 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
249 Check that the fix worked and that running it twice does nothing |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
250 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
251 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
252 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
253 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
254 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
255 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
256 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
257 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
258 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
259 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
260 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
261 $ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
262 no affected revisions were found |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
263 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
264 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
265 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
266 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
267 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
268 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
269 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
270 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
271 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
272 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
273 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
274 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
275 Try the using the report options |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
276 -------------------------------- |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
277 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
278 $ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
279 $ mkdir repo-to-fix-report |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
280 $ cd repo-to-fix |
49486
58e38c1a2370
tests: fix tar invocation, to address issue 6740
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49458
diff
changeset
|
281 $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
282 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
283 $ hg debug-repair-issue6528 --to-report $TESTTMP/report.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
284 found affected revision 1 for filelog 'data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
285 found affected revision 1 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
286 found affected revision 3 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
287 $ cat $TESTTMP/report.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
288 2a80419dfc31d7dfb308ac40f3f138282de7d73b D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
289 a58b36ad6b6545195952793099613c2116f3563b,ea4f2f2463cca5b29ddf3461012b8ce5c6dac175 b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
290 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
291 $ hg debug-repair-issue6528 --from-report $TESTTMP/report.txt --dry-run |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
292 loading report file '$TESTTMP/report.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
293 found affected revision 1 for filelog 'D.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
294 found affected revision 1 for filelog 'b.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
295 found affected revision 3 for filelog 'b.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
296 $ hg st |
48546
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
297 M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48470
diff
changeset
|
298 M b.txt |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
299 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
300 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
301 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
302 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
303 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
304 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
305 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
306 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
307 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
308 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
309 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
310 $ hg debug-repair-issue6528 --from-report $TESTTMP/report.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
311 loading report file '$TESTTMP/report.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
312 found affected revision 1 for filelog 'D.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
313 repaired revision 1 of 'filelog data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
314 found affected revision 1 for filelog 'b.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
315 found affected revision 3 for filelog 'b.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
316 repaired revision 1 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
317 repaired revision 3 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
318 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
319 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
320 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
321 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
322 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
323 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
324 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
325 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
326 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
327 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
328 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
329 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
330 Check that the revision is not "fixed" again |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
331 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
332 $ hg debug-repair-issue6528 --from-report $TESTTMP/report.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
333 loading report file '$TESTTMP/report.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
334 revision 2a80419dfc31d7dfb308ac40f3f138282de7d73b of file 'D.txt' is not affected |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
335 no affected revisions were found for 'D.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
336 revision a58b36ad6b6545195952793099613c2116f3563b of file 'b.txt' is not affected |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
337 revision ea4f2f2463cca5b29ddf3461012b8ce5c6dac175 of file 'b.txt' is not affected |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
338 no affected revisions were found for 'b.txt' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
339 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
340 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
341 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
342 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
343 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
344 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
345 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
346 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
347 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
348 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
349 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
350 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
351 Try it with a non-inline revlog |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
352 ------------------------------- |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
353 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
354 $ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
355 $ mkdir $TESTTMP/ext |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
356 $ cat << EOF > $TESTTMP/ext/small_inline.py |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
357 > from mercurial import revlog |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
358 > revlog._maxinline = 8 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
359 > EOF |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
360 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
361 $ cat << EOF >> $HGRCPATH |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
362 > [extensions] |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
363 > small_inline=$TESTTMP/ext/small_inline.py |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
364 > EOF |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
365 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
366 $ mkdir repo-to-fix-not-inline |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
367 $ cd repo-to-fix-not-inline |
49486
58e38c1a2370
tests: fix tar invocation, to address issue 6740
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49458
diff
changeset
|
368 $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar |
47815
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
369 $ echo b >> b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
370 $ hg commit -qm "inline -> separate" |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
371 $ find .hg -name *b.txt.d |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
372 .hg/store/data/b.txt.d |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
373 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
374 Status is correct, but the problem is still there, in the earlier revision |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
375 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
376 $ hg up 3 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
377 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
378 $ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
379 M b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
380 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
381 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
382 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
383 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
384 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
385 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
386 4 8 db234885e2fe ea4f2f2463cc 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
387 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
388 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
389 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
390 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
391 2 8 65aecc89bb5d 2a80419dfc31 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
392 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
393 Run the fix on the non-inline revlog |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
394 $ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
395 found affected revision 1 for filelog 'data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
396 repaired revision 1 of 'filelog data/D.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
397 found affected revision 1 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
398 found affected revision 3 for filelog 'data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
399 repaired revision 1 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
400 repaired revision 3 of 'filelog data/b.txt.i' |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
401 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
402 Check that it worked |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
403 $ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
404 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
405 0 2 05b806ebe5ea 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
406 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
407 2 6 216a5fe8b8ed 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
408 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
409 4 8 db234885e2fe ea4f2f2463cc 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
410 $ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
411 rev linkrev nodeid p1 p2 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
412 0 6 2a8d3833f2fb 000000000000 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
413 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
414 2 8 65aecc89bb5d 2a80419dfc31 000000000000 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
415 $ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
416 no affected revisions were found |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47504
diff
changeset
|
417 $ hg st |
47821
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
418 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
419 $ cd .. |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
420 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
421 Applying a bad bundle should fix it on the fly |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
422 ---------------------------------------------- |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
423 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
424 from a v1 bundle |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
425 ~~~~~~~~~~~~~~~~ |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
426 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
427 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
428 bzip2-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
429 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
430 $ hg init unbundle-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
431 $ cd unbundle-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
432 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
433 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
434 adding changesets |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
435 adding manifests |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
436 adding file changes |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
437 added 8 changesets with 12 changes to 4 files |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
438 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
439 (run 'hg update' to get a working copy) |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
440 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
441 Check that revision were fixed on the fly |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
442 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
443 $ hg debugrevlogindex b.txt |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
444 rev linkrev nodeid p1 p2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
445 0 2 05b806ebe5ea 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
446 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
447 2 6 216a5fe8b8ed 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
448 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
449 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
450 $ hg debugrevlogindex D.txt |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
451 rev linkrev nodeid p1 p2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
452 0 6 2a8d3833f2fb 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
453 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
454 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
455 That we don't see the symptoms of the bug |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
456 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
457 $ hg up -- -1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
458 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
459 $ hg status |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
460 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
461 And that the repair command does not find anything to fix |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
462 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
463 $ hg debug-repair-issue6528 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
464 no affected revisions were found |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
465 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
466 $ cd .. |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
467 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
468 from a v2 bundle |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
469 ~~~~~~~~~~~~~~~~ |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
470 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
471 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
472 bzip2-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
473 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
474 $ hg init unbundle-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
475 $ cd unbundle-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
476 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
477 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
478 adding changesets |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
479 adding manifests |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
480 adding file changes |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
481 added 8 changesets with 12 changes to 4 files |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
482 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
483 (run 'hg update' to get a working copy) |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
484 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
485 Check that revision were fixed on the fly |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
486 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
487 $ hg debugrevlogindex b.txt |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
488 rev linkrev nodeid p1 p2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
489 0 2 05b806ebe5ea 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
490 1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
491 2 6 216a5fe8b8ed 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
492 3 7 ea4f2f2463cc 000000000000 216a5fe8b8ed |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
493 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
494 $ hg debugrevlogindex D.txt |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
495 rev linkrev nodeid p1 p2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
496 0 6 2a8d3833f2fb 000000000000 000000000000 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
497 1 7 2a80419dfc31 000000000000 2a8d3833f2fb |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
498 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
499 That we don't see the symptoms of the bug |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
500 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
501 $ hg up -- -1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
502 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
503 $ hg status |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
504 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
505 And that the repair command does not find anything to fix |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
506 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
507 $ hg debug-repair-issue6528 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
508 no affected revisions were found |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
509 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47817
diff
changeset
|
510 $ cd .. |
47822
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
511 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
512 A config option can disable the fixing of the bad bundle on the fly |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
513 ------------------------------------------------------------------- |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
514 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
515 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
516 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
517 from a v1 bundle |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
518 ~~~~~~~~~~~~~~~~ |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
519 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
520 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v1 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
521 bzip2-v1 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
522 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
523 $ hg init unbundle-v1-no-fix |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
524 $ cd unbundle-v1-no-fix |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
525 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
526 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v1 --config storage.revlog.issue6528.fix-incoming=no |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
527 adding changesets |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
528 adding manifests |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
529 adding file changes |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
530 added 8 changesets with 12 changes to 4 files |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
531 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
532 (run 'hg update' to get a working copy) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
533 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
534 Check that revision were not fixed on the fly |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
535 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
536 $ hg debugrevlogindex b.txt |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
537 rev linkrev nodeid p1 p2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
538 0 2 05b806ebe5ea 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
539 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
540 2 6 216a5fe8b8ed 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
541 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
542 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
543 $ hg debugrevlogindex D.txt |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
544 rev linkrev nodeid p1 p2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
545 0 6 2a8d3833f2fb 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
546 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
547 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
548 That we do see the symptoms of the bug |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
549 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
550 $ hg up -- -1 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
551 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
552 $ hg status |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
553 M D.txt (?) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
554 M b.txt (?) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
555 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
556 And that the repair command find issue to fix. |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
557 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
558 $ hg debug-repair-issue6528 --dry-run |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
559 found affected revision 1 for filelog 'data/D.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
560 found affected revision 1 for filelog 'data/b.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
561 found affected revision 3 for filelog 'data/b.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
562 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
563 $ cd .. |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
564 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
565 from a v2 bundle |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
566 ~~~~~~~~~~~~~~~~ |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
567 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
568 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
569 bzip2-v2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
570 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
571 $ hg init unbundle-v2-no-fix |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
572 $ cd unbundle-v2-no-fix |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
573 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
574 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v2 --config storage.revlog.issue6528.fix-incoming=no |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
575 adding changesets |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
576 adding manifests |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
577 adding file changes |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
578 added 8 changesets with 12 changes to 4 files |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
579 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
580 (run 'hg update' to get a working copy) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
581 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
582 Check that revision were not fixed on the fly |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
583 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
584 $ hg debugrevlogindex b.txt |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
585 rev linkrev nodeid p1 p2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
586 0 2 05b806ebe5ea 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
587 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
588 2 6 216a5fe8b8ed 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
589 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
590 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
591 $ hg debugrevlogindex D.txt |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
592 rev linkrev nodeid p1 p2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
593 0 6 2a8d3833f2fb 000000000000 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
594 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
595 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
596 That we do see the symptoms of the bug |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
597 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
598 $ hg up -- -1 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
599 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
600 $ hg status |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
601 M D.txt (?) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
602 M b.txt (?) |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
603 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
604 And that the repair command find issue to fix. |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
605 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
606 $ hg debug-repair-issue6528 --dry-run |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
607 found affected revision 1 for filelog 'data/D.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
608 found affected revision 1 for filelog 'data/b.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
609 found affected revision 3 for filelog 'data/b.txt.i' |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
610 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47821
diff
changeset
|
611 $ cd .. |