https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30358
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #26 from David Nind <[email protected]> --- Patch no longer applies... git bz apply 30358 Bug 30358 - Strip leading/trailing whitespace characters from input fields when cataloguing 137451 - Bug 30358: Strip leading/trailing whitespace characters from input fields when cataloguing 137452 - Bug 30358: (follow-up) Also strip inner newlines 137453 - Bug 30358: (follow-up) Inner newlines should be replaced with a space 137454 - Bug 30358: (follow-up) Fixing tests and including for inner newlines 137455 - Bug 30358: (follow-up) Clarify syspref wording about fields affected 137456 - Bug 30358: (follow-up) Consider field has multiple subfields of same key 137457 - Bug 30358: (follow-up) Put multiple subfields fix on auth side 139110 - Bug 30358: (follow-up) stripWhitespaceChars subroutine and tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30358: Strip leading/trailing whitespace characters from input fields when cataloguing .git/rebase-apply/patch:16: trailing whitespace. $record->add_fields($auth_type_tag,'','', $auth_type_subfield=>$authtypecode); warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/AuthoritiesMarc.pm M C4/Biblio.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref M t/db_dependent/Biblio/ModBiblioMarc.t .git/rebase-apply/patch:16: trailing whitespace. $record->add_fields($auth_type_tag,'','', $auth_type_subfield=>$authtypecode); warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Biblio/ModBiblioMarc.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging C4/Biblio.pm Auto-merging C4/AuthoritiesMarc.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30358: Strip leading/trailing whitespace characters from input fields when cataloguing -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
