author | Gregory Szorc <gregory.szorc@gmail.com> |
Sat, 19 Feb 2022 18:42:12 -0700 | |
changeset 48938 | 4561ec90d3c1 |
parent 48575 | e91aa800ae5b |
child 49407 | b10e4c19f8c5 |
permissions | -rw-r--r-- |
47051
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 |
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
6 |
===== |
47051
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 |
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
96 |
============================ |
47051
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 |
47052
411dc27fd9fd
corruption: backout changeset 49fd21f32695 (issue6528)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47051
diff
changeset
|
140 |
1 3 a58b36ad6b65 000000000000 05b806ebe5ea |
47051
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 |
|
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
169 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
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:
47052
diff
changeset
|
171 |
===================================== |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
172 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
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:
47052
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:
47052
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:
47052
diff
changeset
|
176 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
177 |
$ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
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:
47052
diff
changeset
|
179 |
$ cd repo-to-fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
180 |
#if windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
181 |
tar interprets `:` in paths (like `C:`) as being remote, force local on Windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
182 |
only since some versions of tar don't have this flag. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
183 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
184 |
$ tar --force-local -xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
185 |
#else |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
186 |
$ tar xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
187 |
#endif |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
188 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
189 |
Check that the issue is present |
48509
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48384
diff
changeset
|
190 |
(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:
48384
diff
changeset
|
191 |
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:
48384
diff
changeset
|
192 |
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:
48384
diff
changeset
|
193 |
deltas where possible.) |
3eb3aef6d3bf
rhg: Mark it as expected that the issue6528 bug is not reproduced
Simon Sapin <simon.sapin@octobus.net>
parents:
48384
diff
changeset
|
194 |
|
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
195 |
$ hg st |
48575
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
196 |
M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
197 |
M b.txt |
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
198 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
199 |
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:
47052
diff
changeset
|
200 |
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:
47052
diff
changeset
|
201 |
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:
47052
diff
changeset
|
202 |
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:
47052
diff
changeset
|
203 |
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:
47052
diff
changeset
|
204 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
205 |
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:
47052
diff
changeset
|
206 |
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:
47052
diff
changeset
|
207 |
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:
47052
diff
changeset
|
208 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
209 |
Dry-run the fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
210 |
$ 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:
47052
diff
changeset
|
211 |
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:
47052
diff
changeset
|
212 |
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:
47052
diff
changeset
|
213 |
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:
47052
diff
changeset
|
214 |
$ hg st |
48575
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
215 |
M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
216 |
M b.txt |
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
217 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
218 |
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:
47052
diff
changeset
|
219 |
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:
47052
diff
changeset
|
220 |
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:
47052
diff
changeset
|
221 |
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:
47052
diff
changeset
|
222 |
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:
47052
diff
changeset
|
223 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
224 |
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:
47052
diff
changeset
|
225 |
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:
47052
diff
changeset
|
226 |
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:
47052
diff
changeset
|
227 |
|
47812
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
228 |
Test the --paranoid option |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
229 |
$ 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:
47810
diff
changeset
|
230 |
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:
47810
diff
changeset
|
231 |
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:
47810
diff
changeset
|
232 |
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:
47810
diff
changeset
|
233 |
$ hg st |
48575
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
234 |
M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
235 |
M b.txt |
47812
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
236 |
$ hg debugrevlogindex b.txt |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
237 |
rev linkrev nodeid p1 p2 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
238 |
0 2 05b806ebe5ea 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
239 |
1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
240 |
2 6 216a5fe8b8ed 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
241 |
3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
242 |
$ hg debugrevlogindex D.txt |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
243 |
rev linkrev nodeid p1 p2 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
244 |
0 6 2a8d3833f2fb 000000000000 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
245 |
1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
855463b5fe49
debugcommands: add a `--paranoid` option to `debug-repair-issue-6528`
Raphaël Gomès <rgomes@octobus.net>
parents:
47810
diff
changeset
|
246 |
|
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
247 |
Run the fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
248 |
$ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
249 |
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:
47052
diff
changeset
|
250 |
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:
47052
diff
changeset
|
251 |
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:
47052
diff
changeset
|
252 |
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:
47052
diff
changeset
|
253 |
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:
47052
diff
changeset
|
254 |
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:
47052
diff
changeset
|
255 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
256 |
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:
47052
diff
changeset
|
257 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
258 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
259 |
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:
47052
diff
changeset
|
260 |
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:
47052
diff
changeset
|
261 |
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:
47052
diff
changeset
|
262 |
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:
47052
diff
changeset
|
263 |
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:
47052
diff
changeset
|
264 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
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:
47052
diff
changeset
|
266 |
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:
47052
diff
changeset
|
267 |
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:
47052
diff
changeset
|
268 |
$ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
269 |
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:
47052
diff
changeset
|
270 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
271 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
272 |
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:
47052
diff
changeset
|
273 |
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:
47052
diff
changeset
|
274 |
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:
47052
diff
changeset
|
275 |
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:
47052
diff
changeset
|
276 |
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:
47052
diff
changeset
|
277 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
278 |
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:
47052
diff
changeset
|
279 |
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:
47052
diff
changeset
|
280 |
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:
47052
diff
changeset
|
281 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
282 |
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:
47052
diff
changeset
|
283 |
-------------------------------- |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
284 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
285 |
$ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
286 |
$ 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:
47052
diff
changeset
|
287 |
$ cd repo-to-fix |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
288 |
#if windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
289 |
tar interprets `:` in paths (like `C:`) as being remote, force local on Windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
290 |
only since some versions of tar don't have this flag. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
291 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
292 |
$ tar --force-local -xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
293 |
#else |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
294 |
$ tar xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
295 |
#endif |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
296 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
297 |
$ 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:
47052
diff
changeset
|
298 |
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:
47052
diff
changeset
|
299 |
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:
47052
diff
changeset
|
300 |
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:
47052
diff
changeset
|
301 |
$ cat $TESTTMP/report.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
302 |
2a80419dfc31d7dfb308ac40f3f138282de7d73b D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
303 |
a58b36ad6b6545195952793099613c2116f3563b,ea4f2f2463cca5b29ddf3461012b8ce5c6dac175 b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
304 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
305 |
$ 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:
47052
diff
changeset
|
306 |
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:
47052
diff
changeset
|
307 |
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:
47052
diff
changeset
|
308 |
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:
47052
diff
changeset
|
309 |
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:
47052
diff
changeset
|
310 |
$ hg st |
48575
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
311 |
M D.txt |
e91aa800ae5b
rhg: desambiguate status without decompressing filelog if possible
Simon Sapin <simon.sapin@octobus.net>
parents:
48509
diff
changeset
|
312 |
M b.txt |
47810
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
313 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
314 |
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:
47052
diff
changeset
|
315 |
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:
47052
diff
changeset
|
316 |
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:
47052
diff
changeset
|
317 |
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:
47052
diff
changeset
|
318 |
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:
47052
diff
changeset
|
319 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
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:
47052
diff
changeset
|
321 |
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:
47052
diff
changeset
|
322 |
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:
47052
diff
changeset
|
323 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
324 |
$ 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:
47052
diff
changeset
|
325 |
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:
47052
diff
changeset
|
326 |
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:
47052
diff
changeset
|
327 |
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:
47052
diff
changeset
|
328 |
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:
47052
diff
changeset
|
329 |
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:
47052
diff
changeset
|
330 |
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:
47052
diff
changeset
|
331 |
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:
47052
diff
changeset
|
332 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
333 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
334 |
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:
47052
diff
changeset
|
335 |
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:
47052
diff
changeset
|
336 |
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:
47052
diff
changeset
|
337 |
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:
47052
diff
changeset
|
338 |
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:
47052
diff
changeset
|
339 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
340 |
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:
47052
diff
changeset
|
341 |
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:
47052
diff
changeset
|
342 |
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:
47052
diff
changeset
|
343 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
344 |
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:
47052
diff
changeset
|
345 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
346 |
$ 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:
47052
diff
changeset
|
347 |
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:
47052
diff
changeset
|
348 |
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:
47052
diff
changeset
|
349 |
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:
47052
diff
changeset
|
350 |
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:
47052
diff
changeset
|
351 |
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:
47052
diff
changeset
|
352 |
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:
47052
diff
changeset
|
353 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
354 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
355 |
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:
47052
diff
changeset
|
356 |
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:
47052
diff
changeset
|
357 |
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:
47052
diff
changeset
|
358 |
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:
47052
diff
changeset
|
359 |
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:
47052
diff
changeset
|
360 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
361 |
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:
47052
diff
changeset
|
362 |
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:
47052
diff
changeset
|
363 |
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:
47052
diff
changeset
|
364 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
365 |
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:
47052
diff
changeset
|
366 |
------------------------------- |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
367 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
368 |
$ cd .. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
369 |
$ mkdir $TESTTMP/ext |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
370 |
$ 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:
47052
diff
changeset
|
371 |
> from mercurial import revlog |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
372 |
> revlog._maxinline = 8 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
373 |
> EOF |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
374 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
375 |
$ cat << EOF >> $HGRCPATH |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
376 |
> [extensions] |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
377 |
> 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:
47052
diff
changeset
|
378 |
> EOF |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
379 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
380 |
$ 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:
47052
diff
changeset
|
381 |
$ cd 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:
47052
diff
changeset
|
382 |
#if windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
383 |
tar interprets `:` in paths (like `C:`) as being remote, force local on Windows |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
384 |
only since some versions of tar don't have this flag. |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
385 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
386 |
$ tar --force-local -xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
387 |
#else |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
388 |
$ tar xf $TESTDIR/bundles/issue6528.tar |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
389 |
#endif |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
390 |
$ echo b >> b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
391 |
$ 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:
47052
diff
changeset
|
392 |
$ 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:
47052
diff
changeset
|
393 |
.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:
47052
diff
changeset
|
394 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
395 |
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:
47052
diff
changeset
|
396 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
397 |
$ hg up 3 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
398 |
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:
47052
diff
changeset
|
399 |
$ hg st |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
400 |
M b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
401 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
402 |
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:
47052
diff
changeset
|
403 |
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:
47052
diff
changeset
|
404 |
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:
47052
diff
changeset
|
405 |
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:
47052
diff
changeset
|
406 |
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:
47052
diff
changeset
|
407 |
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:
47052
diff
changeset
|
408 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
409 |
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:
47052
diff
changeset
|
410 |
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:
47052
diff
changeset
|
411 |
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:
47052
diff
changeset
|
412 |
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:
47052
diff
changeset
|
413 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
414 |
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:
47052
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:
47052
diff
changeset
|
416 |
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:
47052
diff
changeset
|
417 |
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:
47052
diff
changeset
|
418 |
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:
47052
diff
changeset
|
419 |
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:
47052
diff
changeset
|
420 |
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:
47052
diff
changeset
|
421 |
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:
47052
diff
changeset
|
422 |
|
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
423 |
Check that it worked |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
424 |
$ hg debugrevlogindex b.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
425 |
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:
47052
diff
changeset
|
426 |
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:
47052
diff
changeset
|
427 |
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:
47052
diff
changeset
|
428 |
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:
47052
diff
changeset
|
429 |
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:
47052
diff
changeset
|
430 |
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:
47052
diff
changeset
|
431 |
$ hg debugrevlogindex D.txt |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
432 |
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:
47052
diff
changeset
|
433 |
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:
47052
diff
changeset
|
434 |
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:
47052
diff
changeset
|
435 |
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:
47052
diff
changeset
|
436 |
$ hg debug-repair-issue6528 |
b30a53ffbf9b
debugcommands: introduce a debug command to repair repos affected by issue6528
Raphaël Gomès <rgomes@octobus.net>
parents:
47052
diff
changeset
|
437 |
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:
47052
diff
changeset
|
438 |
$ hg st |
47816
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
439 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
440 |
$ cd .. |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
441 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
442 |
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:
47812
diff
changeset
|
443 |
---------------------------------------------- |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
444 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
445 |
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:
47812
diff
changeset
|
446 |
~~~~~~~~~~~~~~~~ |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
447 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
448 |
$ 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:
47812
diff
changeset
|
449 |
bzip2-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
450 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
451 |
$ 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:
47812
diff
changeset
|
452 |
$ cd unbundle-v1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
453 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
454 |
$ 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:
47812
diff
changeset
|
455 |
adding changesets |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
456 |
adding manifests |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
457 |
adding file changes |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
458 |
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:
47812
diff
changeset
|
459 |
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:
47812
diff
changeset
|
460 |
(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:
47812
diff
changeset
|
461 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
462 |
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:
47812
diff
changeset
|
463 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
464 |
$ 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:
47812
diff
changeset
|
465 |
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:
47812
diff
changeset
|
466 |
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:
47812
diff
changeset
|
467 |
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:
47812
diff
changeset
|
468 |
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:
47812
diff
changeset
|
469 |
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:
47812
diff
changeset
|
470 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
471 |
$ 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:
47812
diff
changeset
|
472 |
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:
47812
diff
changeset
|
473 |
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:
47812
diff
changeset
|
474 |
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:
47812
diff
changeset
|
475 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
476 |
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:
47812
diff
changeset
|
477 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
478 |
$ hg up -- -1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
479 |
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:
47812
diff
changeset
|
480 |
$ hg status |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
481 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
482 |
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:
47812
diff
changeset
|
483 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
484 |
$ 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:
47812
diff
changeset
|
485 |
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:
47812
diff
changeset
|
486 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
487 |
$ cd .. |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
488 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
489 |
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:
47812
diff
changeset
|
490 |
~~~~~~~~~~~~~~~~ |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
491 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
492 |
$ 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:
47812
diff
changeset
|
493 |
bzip2-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
494 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
495 |
$ 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:
47812
diff
changeset
|
496 |
$ cd unbundle-v2 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
497 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
498 |
$ 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:
47812
diff
changeset
|
499 |
adding changesets |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
500 |
adding manifests |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
501 |
adding file changes |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
502 |
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:
47812
diff
changeset
|
503 |
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:
47812
diff
changeset
|
504 |
(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:
47812
diff
changeset
|
505 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
506 |
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:
47812
diff
changeset
|
507 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
508 |
$ 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:
47812
diff
changeset
|
509 |
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:
47812
diff
changeset
|
510 |
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:
47812
diff
changeset
|
511 |
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:
47812
diff
changeset
|
512 |
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:
47812
diff
changeset
|
513 |
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:
47812
diff
changeset
|
514 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
515 |
$ 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:
47812
diff
changeset
|
516 |
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:
47812
diff
changeset
|
517 |
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:
47812
diff
changeset
|
518 |
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:
47812
diff
changeset
|
519 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
520 |
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:
47812
diff
changeset
|
521 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
522 |
$ hg up -- -1 |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
523 |
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:
47812
diff
changeset
|
524 |
$ hg status |
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
525 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
526 |
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:
47812
diff
changeset
|
527 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
528 |
$ 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:
47812
diff
changeset
|
529 |
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:
47812
diff
changeset
|
530 |
|
c30ca163b45e
issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47812
diff
changeset
|
531 |
$ cd .. |
47817
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
532 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
533 |
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:
47816
diff
changeset
|
534 |
------------------------------------------------------------------- |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
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:
47816
diff
changeset
|
536 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
537 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
538 |
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:
47816
diff
changeset
|
539 |
~~~~~~~~~~~~~~~~ |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
540 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
541 |
$ 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:
47816
diff
changeset
|
542 |
bzip2-v1 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
543 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
544 |
$ 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:
47816
diff
changeset
|
545 |
$ 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:
47816
diff
changeset
|
546 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
547 |
$ 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:
47816
diff
changeset
|
548 |
adding changesets |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
549 |
adding manifests |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
550 |
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:
47816
diff
changeset
|
551 |
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:
47816
diff
changeset
|
552 |
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:
47816
diff
changeset
|
553 |
(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:
47816
diff
changeset
|
554 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
555 |
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:
47816
diff
changeset
|
556 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
557 |
$ 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:
47816
diff
changeset
|
558 |
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:
47816
diff
changeset
|
559 |
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:
47816
diff
changeset
|
560 |
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:
47816
diff
changeset
|
561 |
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:
47816
diff
changeset
|
562 |
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:
47816
diff
changeset
|
563 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
564 |
$ 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:
47816
diff
changeset
|
565 |
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:
47816
diff
changeset
|
566 |
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:
47816
diff
changeset
|
567 |
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:
47816
diff
changeset
|
568 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
569 |
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:
47816
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:
47816
diff
changeset
|
571 |
$ 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:
47816
diff
changeset
|
572 |
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:
47816
diff
changeset
|
573 |
$ hg status |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
574 |
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:
47816
diff
changeset
|
575 |
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:
47816
diff
changeset
|
576 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
577 |
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:
47816
diff
changeset
|
578 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
579 |
$ 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:
47816
diff
changeset
|
580 |
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:
47816
diff
changeset
|
581 |
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:
47816
diff
changeset
|
582 |
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:
47816
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:
47816
diff
changeset
|
584 |
$ cd .. |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
585 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
586 |
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:
47816
diff
changeset
|
587 |
~~~~~~~~~~~~~~~~ |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
588 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
589 |
$ 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:
47816
diff
changeset
|
590 |
bzip2-v2 |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
591 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
592 |
$ 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:
47816
diff
changeset
|
593 |
$ 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:
47816
diff
changeset
|
594 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
595 |
$ 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:
47816
diff
changeset
|
596 |
adding changesets |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
597 |
adding manifests |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
598 |
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:
47816
diff
changeset
|
599 |
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:
47816
diff
changeset
|
600 |
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:
47816
diff
changeset
|
601 |
(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:
47816
diff
changeset
|
602 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
603 |
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:
47816
diff
changeset
|
604 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
605 |
$ 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:
47816
diff
changeset
|
606 |
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:
47816
diff
changeset
|
607 |
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:
47816
diff
changeset
|
608 |
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:
47816
diff
changeset
|
609 |
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:
47816
diff
changeset
|
610 |
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:
47816
diff
changeset
|
611 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
612 |
$ 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:
47816
diff
changeset
|
613 |
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:
47816
diff
changeset
|
614 |
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:
47816
diff
changeset
|
615 |
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:
47816
diff
changeset
|
616 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
617 |
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:
47816
diff
changeset
|
618 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
619 |
$ 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:
47816
diff
changeset
|
620 |
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:
47816
diff
changeset
|
621 |
$ hg status |
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
622 |
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:
47816
diff
changeset
|
623 |
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:
47816
diff
changeset
|
624 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
625 |
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:
47816
diff
changeset
|
626 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
627 |
$ 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:
47816
diff
changeset
|
628 |
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:
47816
diff
changeset
|
629 |
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:
47816
diff
changeset
|
630 |
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:
47816
diff
changeset
|
631 |
|
2813d406b036
issue6528: add a config option to control the fixing on the fly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47816
diff
changeset
|
632 |
$ cd .. |