|
Description
Kyle M Hall
2013-05-24 11:51:05 UTC
Created attachment 18379 [details] [review] Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Test Plan: 1) Apply patch 2) Run updatedatabase.pl 3) View some records with authorities 4) Note your previously set authority separator should still be in use Maybe there's something wrong with my files, but I think you need a rebase. Applying: Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql Failed to merge in the changes. Patch failed at 0001 Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Created attachment 26941 [details] [review] Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Test Plan: 1) Apply patch 2) Run updatedatabase.pl 3) View some records with authorities 4) Note your previously set authority separator should still be in use Created attachment 26942 [details] [review] Bug 10330 - Follow up - missed case of authoritysep $ git grep authoritysep This showed: 1) the updatedatabase.pl script, as expected, 2) lots of po files, 3) a test file that was missed. TEST PLAN --------- 1) prove -v t/db_dependent/Search.t 2) Run koha QA test tools (In reply to M. Tompsett from comment #3) > Created attachment 26941 [details] [review] [review] > Bug 10330 - Rename system preference authoritysep to AuthoritySeperator > > Test Plan: > 1) Apply patch > 2) Run updatedatabase.pl > 3) View some records with authorities > 4) Note your previously set authority separator should still be in use Mark, this first one is signed? Or, Are you considering to sign it? I signed off the first one. The second (Follow up...) I wrote. It is NOT signed off. Hmmm... on second thought, just consider nothing signed. I may have just rebased, since I don't have a 10330 branch in my unimarc vm. I have been trying to save things from the patch does not apply pile. Created attachment 27903 [details] [review] [SIGNED-OFF] Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Test Plan: 1) Apply patch 2) Run updatedatabase.pl 3) View some records with authorities 4) Note your previously set authority separator should still be in use Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> No koha-qa errors. Created attachment 27904 [details] [review] [SIGNED-OFF] Bug 10330 - Follow up - missed case of authoritysep $ git grep authoritysep This showed: 1) the updatedatabase.pl script, as expected, 2) lots of po files, 3) a test file that was missed. TEST PLAN --------- 1) prove -v t/db_dependent/Search.t 2) Run koha QA test tools Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Work (both patches). Test pass. No koha-qa errors Created attachment 28118 [details] [review] Bug 10330 - Rename system preference authoritysep to AuthoritySeperator Test Plan: 1) Apply patch 2) Run updatedatabase.pl 3) View some records with authorities 4) Note your previously set authority separator should still be in use Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> No koha-qa errors. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Created attachment 28119 [details] [review] Bug 10330 - Follow up - missed case of authoritysep $ git grep authoritysep This showed: 1) the updatedatabase.pl script, as expected, 2) lots of po files, 3) a test file that was missed. TEST PLAN --------- 1) prove -v t/db_dependent/Search.t 2) Run koha QA test tools Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Work (both patches). Test pass. No koha-qa errors Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Pushed to master. Thanks, Kyle! |