https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20447
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #650 from Katrin Fischer <[email protected]> --- At the moment this patch set doesn't apply, but it might make sense to wait with the rebase until 22.05 is out the door and then make a focused effort. Unfortunately we only have a week now until soft feature freeze and I feel this would be too huge to get tested well in this timeframe :( Applying: Bug 20447: MARC Holdings support Using index info to reconstruct a base tree... M C4/Biblio.pm M C4/ImportBatch.pm M C4/Items.pm M C4/Search.pm M C4/XSLT.pm M Koha/Biblio.pm M Koha/Item.pm M catalogue/detail.pl M cataloguing/additem.pl M installer/data/mysql/kohastructure.sql M installer/data/mysql/mandatory/auth_val_cat.sql M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt M koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl M t/db_dependent/Koha/Biblio.t M t/db_dependent/Koha/Item.t M t/lib/TestBuilder.pm M tools/stage-marc-import.pl Falling back to patching base and 3-way merge... Auto-merging tools/stage-marc-import.pl Auto-merging t/lib/TestBuilder.pm Auto-merging t/db_dependent/Koha/Item.t Auto-merging t/db_dependent/Koha/Biblio.t Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging installer/data/mysql/mandatory/auth_val_cat.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging cataloguing/additem.pl Auto-merging catalogue/detail.pl Auto-merging Koha/Item.pm Auto-merging Koha/Biblio.pm CONFLICT (content): Merge conflict in Koha/Biblio.pm Auto-merging C4/XSLT.pm Auto-merging C4/Search.pm Auto-merging C4/Items.pm Auto-merging C4/ImportBatch.pm Auto-merging C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 20447: MARC Holdings support hint: Use 'git am --show-current-patch=diff' to see the failed 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-20447-MARC-Holdings-support-BYfeaD.patch -- 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/
