https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14957
Magnus Enger <mag...@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mag...@libriotech.no --- Comment #5 from Magnus Enger <mag...@libriotech.no> --- Just confirming the patches do not apply. Here is the error: $ git bz apply 14957 Bug 14957 - Write protecting MARC fields based on source of import 44056 - Bug 14957: Rule based permission for MARC fields 44057 - Bug 14957: Database changes 44058 - Bug 14957: Add filters to relevant scripts Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14957: Rule based permission for MARC fields Using index info to reconstruct a base tree... M C4/Biblio.pm M koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 14957: Rule based permission for MARC fields The copy of the patch that failed is found in: /home/magnus/scripts/kohaclone/.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-14957-Rule-based-permission-for-MARC-fields-IZUxzW.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/