https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8643
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #36 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Hm, there are changes in kohastructure.sql to the table serialitems causing a conflict when applying the patch: Bug 8643 - Add important constraint to marc subfields 60554 - Bug 8643 - Add important constraint to marc subfields 60555 - Bug 8643: (follow-up) atomic update 65149 - Bug 8643 - Added hint for important fields and implemented it for item fields Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8643 - Add important constraint to marc subfields .git/rebase-apply/patch:22: trailing whitespace. FROM marc_tag_structure .git/rebase-apply/patch:23: trailing whitespace. WHERE frameworkcode=? .git/rebase-apply/patch:42: trailing whitespace. FROM marc_subfield_structure .git/rebase-apply/patch:43: trailing whitespace. WHERE frameworkcode=? .git/rebase-apply/patch:194: trailing whitespace. FROM marc_tag_structure warning: squelched 10 whitespace errors warning: 15 lines add whitespace errors. Using index info to reconstruct a base tree... M C4/Biblio.pm M admin/marc_subfields_structure.pl M cataloguing/addbiblio.pl M installer/data/mysql/kohastructure.sql .git/rebase-apply/patch:22: trailing whitespace. FROM marc_tag_structure .git/rebase-apply/patch:23: trailing whitespace. WHERE frameworkcode=? .git/rebase-apply/patch:42: trailing whitespace. FROM marc_subfield_structure .git/rebase-apply/patch:43: trailing whitespace. WHERE frameworkcode=? .git/rebase-apply/patch:194: trailing whitespace. FROM marc_tag_structure warning: squelched 10 whitespace errors warning: 15 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging cataloguing/addbiblio.pl Auto-merging admin/marc_subfields_structure.pl Auto-merging C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 8643 - Add important constraint to marc subfields The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-8643---Add-important-constraint-to-marc-subfie-FP83NQ.patch Are those changes related to the patch? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://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/