|
1
|
patching file redmine-0.9.3/app/controllers/issues_controller.rb
|
|
2
|
Hunk #1 FAILED at 104.
|
|
3
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/app/controllers/issues_controller.rb.rej
|
|
4
|
patching file redmine-0.9.3/app/controllers/projects_controller.rb
|
|
5
|
Hunk #1 FAILED at 137.
|
|
6
|
Hunk #2 FAILED at 352.
|
|
7
|
2 out of 2 hunks FAILED -- saving rejects to file redmine-0.9.3/app/controllers/projects_controller.rb.rej
|
|
8
|
patching file redmine-0.9.3/app/helpers/issues_helper.rb
|
|
9
|
Hunk #1 FAILED at 96.
|
|
10
|
Hunk #2 FAILED at 156.
|
|
11
|
Hunk #3 FAILED at 183.
|
|
12
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/app/helpers/issues_helper.rb.rej
|
|
13
|
patching file redmine-0.9.3/app/models/issue.rb
|
|
14
|
Hunk #1 FAILED at 61.
|
|
15
|
Hunk #2 FAILED at 212.
|
|
16
|
2 out of 2 hunks FAILED -- saving rejects to file redmine-0.9.3/app/models/issue.rb.rej
|
|
17
|
patching file redmine-0.9.3/app/models/query.rb
|
|
18
|
Hunk #1 FAILED at 127.
|
|
19
|
Hunk #2 FAILED at 195.
|
|
20
|
Hunk #3 FAILED at 411.
|
|
21
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/app/models/query.rb.rej
|
|
22
|
patching file redmine-0.9.3/app/models/user.rb
|
|
23
|
Hunk #1 FAILED at 289.
|
|
24
|
Hunk #2 FAILED at 297.
|
|
25
|
2 out of 2 hunks FAILED -- saving rejects to file redmine-0.9.3/app/models/user.rb.rej
|
|
26
|
patching file redmine-0.9.3/app/views/issues/_form.rhtml
|
|
27
|
Hunk #1 FAILED at 15.
|
|
28
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/app/views/issues/_form.rhtml.rej
|
|
29
|
patching file redmine-0.9.3/app/views/issues/show.rhtml
|
|
30
|
Hunk #1 FAILED at 37.
|
|
31
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/app/views/issues/show.rhtml.rej
|
|
32
|
patching file redmine-0.9.3/app/views/projects/show.rhtml
|
|
33
|
Hunk #1 FAILED at 31.
|
|
34
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/app/views/projects/show.rhtml.rej
|
|
35
|
patching file redmine-0.9.3/config/locales/bg.yml
|
|
36
|
Hunk #1 FAILED at 360.
|
|
37
|
Hunk #2 FAILED at 718.
|
|
38
|
Hunk #3 FAILED at 732.
|
|
39
|
Hunk #4 FAILED at 886.
|
|
40
|
4 out of 4 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/bg.yml.rej
|
|
41
|
patching file redmine-0.9.3/config/locales/bs.yml
|
|
42
|
Hunk #1 FAILED at 274.
|
|
43
|
Hunk #2 FAILED at 330.
|
|
44
|
Hunk #3 FAILED at 499.
|
|
45
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/bs.yml.rej
|
|
46
|
patching file redmine-0.9.3/config/locales/ca.yml
|
|
47
|
Hunk #1 FAILED at 256.
|
|
48
|
Hunk #2 FAILED at 311.
|
|
49
|
Hunk #3 FAILED at 479.
|
|
50
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/ca.yml.rej
|
|
51
|
patching file redmine-0.9.3/config/locales/cs.yml
|
|
52
|
Hunk #1 FAILED at 407.
|
|
53
|
Hunk #2 FAILED at 724.
|
|
54
|
Hunk #3 FAILED at 738.
|
|
55
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/cs.yml.rej
|
|
56
|
patching file redmine-0.9.3/config/locales/da.yml
|
|
57
|
Hunk #1 FAILED at 418.
|
|
58
|
Hunk #2 FAILED at 735.
|
|
59
|
Hunk #3 FAILED at 752.
|
|
60
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/da.yml.rej
|
|
61
|
patching file redmine-0.9.3/config/locales/de.yml
|
|
62
|
Hunk #1 FAILED at 279.
|
|
63
|
Hunk #2 FAILED at 327.
|
|
64
|
Hunk #3 FAILED at 494.
|
|
65
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/de.yml.rej
|
|
66
|
patching file redmine-0.9.3/config/locales/el.yml
|
|
67
|
Hunk #1 FAILED at 265.
|
|
68
|
Hunk #2 FAILED at 324.
|
|
69
|
Hunk #3 FAILED at 492.
|
|
70
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/el.yml.rej
|
|
71
|
patching file redmine-0.9.3/config/locales/en.yml
|
|
72
|
Hunk #1 FAILED at 270.
|
|
73
|
Hunk #2 FAILED at 342.
|
|
74
|
Hunk #3 FAILED at 515.
|
|
75
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/en.yml.rej
|
|
76
|
patching file redmine-0.9.3/config/locales/es.yml
|
|
77
|
Hunk #1 FAILED at 300.
|
|
78
|
Hunk #2 FAILED at 539.
|
|
79
|
Hunk #3 FAILED at 693.
|
|
80
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/es.yml.rej
|
|
81
|
patching file redmine-0.9.3/config/locales/fi.yml
|
|
82
|
Hunk #1 FAILED at 417.
|
|
83
|
Hunk #2 FAILED at 754.
|
|
84
|
Hunk #3 FAILED at 768.
|
|
85
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/fi.yml.rej
|
|
86
|
patching file redmine-0.9.3/config/locales/fr.yml
|
|
87
|
Hunk #1 FAILED at 292.
|
|
88
|
Hunk #2 FAILED at 364.
|
|
89
|
Hunk #3 FAILED at 537.
|
|
90
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/fr.yml.rej
|
|
91
|
patching file redmine-0.9.3/config/locales/gl.yml
|
|
92
|
Hunk #1 FAILED at 277.
|
|
93
|
Hunk #2 FAILED at 516.
|
|
94
|
Hunk #3 FAILED at 670.
|
|
95
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/gl.yml.rej
|
|
96
|
patching file redmine-0.9.3/config/locales/he.yml
|
|
97
|
Hunk #1 FAILED at 375.
|
|
98
|
Hunk #2 FAILED at 728.
|
|
99
|
Hunk #3 FAILED at 742.
|
|
100
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/he.yml.rej
|
|
101
|
patching file redmine-0.9.3/config/locales/hr.yml
|
|
102
|
Hunk #1 FAILED at 271.
|
|
103
|
Hunk #2 FAILED at 340.
|
|
104
|
Hunk #3 FAILED at 512.
|
|
105
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/hr.yml.rej
|
|
106
|
patching file redmine-0.9.3/config/locales/hu.yml
|
|
107
|
Hunk #1 FAILED at 434.
|
|
108
|
Hunk #2 FAILED at 749.
|
|
109
|
Hunk #3 FAILED at 763.
|
|
110
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/hu.yml.rej
|
|
111
|
patching file redmine-0.9.3/config/locales/id.yml
|
|
112
|
Hunk #1 FAILED at 273.
|
|
113
|
Hunk #2 FAILED at 335.
|
|
114
|
Hunk #3 FAILED at 506.
|
|
115
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/id.yml.rej
|
|
116
|
patching file redmine-0.9.3/config/locales/it.yml
|
|
117
|
Hunk #1 FAILED at 373.
|
|
118
|
Hunk #2 FAILED at 731.
|
|
119
|
Hunk #3 FAILED at 745.
|
|
120
|
Hunk #4 FAILED at 899.
|
|
121
|
4 out of 4 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/it.yml.rej
|
|
122
|
patching file redmine-0.9.3/config/locales/ja.yml
|
|
123
|
Hunk #1 FAILED at 301.
|
|
124
|
Hunk #2 FAILED at 372.
|
|
125
|
Hunk #3 FAILED at 545.
|
|
126
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/ja.yml.rej
|
|
127
|
patching file redmine-0.9.3/config/locales/ko.yml
|
|
128
|
Hunk #1 FAILED at 321.
|
|
129
|
Hunk #2 FAILED at 380.
|
|
130
|
Hunk #3 FAILED at 548.
|
|
131
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/ko.yml.rej
|
|
132
|
patching file redmine-0.9.3/config/locales/lt.yml
|
|
133
|
Hunk #1 FAILED at 332.
|
|
134
|
Hunk #2 FAILED at 395.
|
|
135
|
Hunk #3 FAILED at 565.
|
|
136
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/lt.yml.rej
|
|
137
|
patching file redmine-0.9.3/config/locales/nl.yml
|
|
138
|
Hunk #1 FAILED at 239.
|
|
139
|
Hunk #2 FAILED at 478.
|
|
140
|
Hunk #3 FAILED at 632.
|
|
141
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/nl.yml.rej
|
|
142
|
patching file redmine-0.9.3/config/locales/no.yml
|
|
143
|
Hunk #1 FAILED at 407.
|
|
144
|
Hunk #2 FAILED at 719.
|
|
145
|
Hunk #3 FAILED at 733.
|
|
146
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/no.yml.rej
|
|
147
|
patching file redmine-0.9.3/config/locales/pl.yml
|
|
148
|
Hunk #1 FAILED at 264.
|
|
149
|
Hunk #2 FAILED at 515.
|
|
150
|
Hunk #3 FAILED at 671.
|
|
151
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/pl.yml.rej
|
|
152
|
patching file redmine-0.9.3/config/locales/pt-BR.yml
|
|
153
|
Hunk #1 FAILED at 286.
|
|
154
|
Hunk #2 FAILED at 446.
|
|
155
|
Hunk #3 FAILED at 766.
|
|
156
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/pt-BR.yml.rej
|
|
157
|
patching file redmine-0.9.3/config/locales/pt.yml
|
|
158
|
Hunk #1 FAILED at 271.
|
|
159
|
Hunk #2 FAILED at 431.
|
|
160
|
Hunk #3 FAILED at 750.
|
|
161
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/pt.yml.rej
|
|
162
|
patching file redmine-0.9.3/config/locales/ro.yml
|
|
163
|
Hunk #1 FAILED at 254.
|
|
164
|
Hunk #2 FAILED at 309.
|
|
165
|
Hunk #3 FAILED at 477.
|
|
166
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/ro.yml.rej
|
|
167
|
patching file redmine-0.9.3/config/locales/ru.yml
|
|
168
|
Hunk #1 FAILED at 346.
|
|
169
|
Hunk #2 FAILED at 586.
|
|
170
|
Hunk #3 FAILED at 767.
|
|
171
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/ru.yml.rej
|
|
172
|
patching file redmine-0.9.3/config/locales/sk.yml
|
|
173
|
Hunk #1 FAILED at 405.
|
|
174
|
Hunk #2 FAILED at 722.
|
|
175
|
Hunk #3 FAILED at 736.
|
|
176
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/sk.yml.rej
|
|
177
|
patching file redmine-0.9.3/config/locales/sl.yml
|
|
178
|
Hunk #1 FAILED at 254.
|
|
179
|
Hunk #2 FAILED at 302.
|
|
180
|
Hunk #3 FAILED at 469.
|
|
181
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/sl.yml.rej
|
|
182
|
patching file redmine-0.9.3/config/locales/sr.yml
|
|
183
|
Hunk #1 FAILED at 389.
|
|
184
|
Hunk #2 FAILED at 740.
|
|
185
|
Hunk #3 FAILED at 754.
|
|
186
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/sr.yml.rej
|
|
187
|
patching file redmine-0.9.3/config/locales/sv.yml
|
|
188
|
Hunk #1 FAILED at 321.
|
|
189
|
Hunk #2 FAILED at 390.
|
|
190
|
Hunk #3 FAILED at 563.
|
|
191
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/sv.yml.rej
|
|
192
|
patching file redmine-0.9.3/config/locales/th.yml
|
|
193
|
Hunk #1 FAILED at 405.
|
|
194
|
Hunk #2 FAILED at 721.
|
|
195
|
Hunk #3 FAILED at 735.
|
|
196
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/th.yml.rej
|
|
197
|
patching file redmine-0.9.3/config/locales/tr.yml
|
|
198
|
Hunk #1 FAILED at 434.
|
|
199
|
Hunk #2 FAILED at 742.
|
|
200
|
Hunk #3 FAILED at 765.
|
|
201
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/tr.yml.rej
|
|
202
|
patching file redmine-0.9.3/config/locales/uk.yml
|
|
203
|
Hunk #1 FAILED at 375.
|
|
204
|
Hunk #2 FAILED at 720.
|
|
205
|
Hunk #3 FAILED at 734.
|
|
206
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/uk.yml.rej
|
|
207
|
patching file redmine-0.9.3/config/locales/vi.yml
|
|
208
|
Hunk #1 FAILED at 316.
|
|
209
|
Hunk #2 FAILED at 476.
|
|
210
|
Hunk #3 FAILED at 798.
|
|
211
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/vi.yml.rej
|
|
212
|
patching file redmine-0.9.3/config/locales/zh-TW.yml
|
|
213
|
Hunk #1 FAILED at 362.
|
|
214
|
Hunk #2 FAILED at 432.
|
|
215
|
Hunk #3 FAILED at 605.
|
|
216
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/zh-TW.yml.rej
|
|
217
|
patching file redmine-0.9.3/config/locales/zh.yml
|
|
218
|
Hunk #1 FAILED at 294.
|
|
219
|
Hunk #2 FAILED at 364.
|
|
220
|
Hunk #3 FAILED at 536.
|
|
221
|
Hunk #4 FAILED at 914.
|
|
222
|
4 out of 4 hunks FAILED -- saving rejects to file redmine-0.9.3/config/locales/zh.yml.rej
|
|
223
|
The next patch would create the file redmine-0.9.3/db/migrate/109_add_issues_private_flag.rb,
|
|
224
|
which already exists! Assume -R? [n]
|
|
225
|
Apply anyway? [n]
|
|
226
|
Skipping patch.
|
|
227
|
1 out of 1 hunk ignored -- saving rejects to file redmine-0.9.3/db/migrate/109_add_issues_private_flag.rb.rej
|
|
228
|
patching file redmine-0.9.3/lib/redmine.rb
|
|
229
|
Hunk #1 FAILED at 44.
|
|
230
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/lib/redmine.rb.rej
|
|
231
|
patching file redmine-0.9.3/test/fixtures/issues.yml
|
|
232
|
Hunk #1 FAILED at 203.
|
|
233
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/fixtures/issues.yml.rej
|
|
234
|
patching file redmine-0.9.3/test/fixtures/member_roles.yml
|
|
235
|
Hunk #1 FAILED at 47.
|
|
236
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/fixtures/member_roles.yml.rej
|
|
237
|
patching file redmine-0.9.3/test/fixtures/members.yml
|
|
238
|
Hunk #1 FAILED at 60.
|
|
239
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/fixtures/members.yml.rej
|
|
240
|
patching file redmine-0.9.3/test/fixtures/roles.yml
|
|
241
|
Hunk #1 FAILED at 12.
|
|
242
|
Hunk #2 FAILED at 65.
|
|
243
|
Hunk #3 FAILED at 109.
|
|
244
|
Hunk #4 FAILED at 185.
|
|
245
|
4 out of 4 hunks FAILED -- saving rejects to file redmine-0.9.3/test/fixtures/roles.yml.rej
|
|
246
|
patching file redmine-0.9.3/test/fixtures/users.yml
|
|
247
|
Hunk #1 FAILED at 152.
|
|
248
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/fixtures/users.yml.rej
|
|
249
|
patching file redmine-0.9.3/test/functional/issues_controller_test.rb
|
|
250
|
Hunk #1 FAILED at 411.
|
|
251
|
Hunk #2 FAILED at 459.
|
|
252
|
Hunk #3 FAILED at 518.
|
|
253
|
3 out of 3 hunks FAILED -- saving rejects to file redmine-0.9.3/test/functional/issues_controller_test.rb.rej
|
|
254
|
patching file redmine-0.9.3/test/functional/projects_controller_test.rb
|
|
255
|
Hunk #1 FAILED at 575.
|
|
256
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/functional/projects_controller_test.rb.rej
|
|
257
|
patching file redmine-0.9.3/test/unit/issue_test.rb
|
|
258
|
Hunk #1 FAILED at 499.
|
|
259
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/unit/issue_test.rb.rej
|
|
260
|
patching file redmine-0.9.3/test/unit/project_test.rb
|
|
261
|
Hunk #1 FAILED at 136.
|
|
262
|
1 out of 1 hunk FAILED -- saving rejects to file redmine-0.9.3/test/unit/project_test.rb.rej
|