http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7419
I'm just a bot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected]. | |org --- Comment #39 from I'm just a bot <[email protected]> --- Applying: Bug 7284: Authority matching improvements Using index info to reconstruct a base tree... M C4/AuthoritiesMarc.pm M C4/Biblio.pm M C4/Heading.pm M C4/Heading/MARC21.pm M C4/Search.pm M acqui/addorderiso2709.pl M acqui/neworderempty.pl M authorities/auth_finder.pl M cataloguing/addbiblio.pl M etc/zebradb/authorities/etc/bib1.att M etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml M etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl A etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl M etc/zebradb/marc_defs/unimarc/authorities/record.abs M installer/data/mysql/sysprefs.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref M misc/link_bibs_to_authorities.pl A t/Heading_MARC21.t A t/db_dependent/lib/KohaTest/AuthoritiesMarc.pm Falling back to patching base and 3-way merge... CONFLICT (modify/delete): t/db_dependent/lib/KohaTest/AuthoritiesMarc.pm deleted in HEAD and modified in Bug 7284: Authority matching improvements. Version Bug 7284: Authority matching improvements of t/db_dependent/lib/KohaTest/AuthoritiesMarc.pm left in tree. Auto-merging t/db_dependent/Linker_FirstMatch.t CONFLICT (add/add): Merge conflict in t/db_dependent/Linker_FirstMatch.t Auto-merging t/Barcodes_annual.t CONFLICT (content): Merge conflict in t/Barcodes_annual.t Auto-merging misc/link_bibs_to_authorities.pl CONFLICT (content): Merge conflict in misc/link_bibs_to_authorities.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging C4/Search.pm CONFLICT (content): Merge conflict in C4/Search.pm Auto-merging C4/Linker/Default.pm CONFLICT (add/add): Merge conflict in C4/Linker/Default.pm Auto-merging C4/Heading/UNIMARC.pm CONFLICT (add/add): Merge conflict in C4/Heading/UNIMARC.pm Auto-merging C4/Heading.pm CONFLICT (content): Merge conflict in C4/Heading.pm Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm Auto-merging C4/AuthoritiesMarc.pm CONFLICT (content): Merge conflict in C4/AuthoritiesMarc.pm Patch failed at 0001 Bug 7284: Authority matching improvements The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
