469293 - 3.2 patch from cvs fails to apply cleanly

Status: RESOLVED FIXED

(Testopia :: General, defect)

Description

[richlv]

User-Agent:       Opera/9.27 (X11; Linux i686; U; en)
Build Identifier: cvs

cvs checkout as of "now".
patch gainst 3.2 has a lot of offset matches, few fuzzy matches and 3 hunks fail completely.

patching file Bugzilla/User.pm
Hunk #1 succeeded at 335 (offset 5 lines).
Hunk #3 succeeded at 652 (offset 5 lines).
Hunk #4 succeeded at 937 (offset 17 lines).
patching file Bugzilla/Error.pm
Hunk #2 succeeded at 115 (offset 4 lines).
patching file Bugzilla/Constants.pm
Hunk #1 succeeded at 131 (offset 5 lines).
Hunk #2 succeeded at 366 (offset 14 lines).
patching file template/en/default/global/common-links.html.tmpl
Hunk #1 FAILED at 103.
1 out of 1 hunk FAILED -- saving rejects to file template/en/default/global/common-links.html.tmpl.rej
patching file Bugzilla/WebService/User.pm
Hunk #1 succeeded at 125 (offset 15 lines).
patching file Bugzilla/Install/Filesystem.pm
patching file Bugzilla/DB/Mysql.pm
Hunk #1 succeeded at 690 with fuzz 2 (offset 77 lines).
patching file Bugzilla/Bug.pm
Hunk #1 succeeded at 2709 (offset 1395 lines).
patching file Bugzilla/Install.pm
patching file template/en/default/global/setting-descs.none.tmpl
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- saving rejects to file template/en/default/global/setting-descs.none.tmpl.rej
patching file Bugzilla/DB/Schema.pm
Hunk #1 FAILED at 1544.
1 out of 1 hunk FAILED -- saving rejects to file Bugzilla/DB/Schema.pm.rej
patching file editproducts.cgi
Hunk #1 succeeded at 370 with fuzz 1 (offset 160 lines).
patching file template/en/default/admin/products/confirm-delete.html.tmpl
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 255 with fuzz 1 (offset 14 lines).


Reproducible: Always

Comment 1

[richlv]

this was fixed by ghendricks yesterday