[Koha-bugs] [Bug 29440] Refactor/clean up bulkmarcimport.pl

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29440

Magnus Enger <magnus at libriotech.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |magnus at libriotech.no

--- Comment #60 from Magnus Enger <magnus at libriotech.no> ---
Sorry, patch does not apply on current master:

$ git bz apply 29440

Bug 29440 - Refactor/clean up bulkmarcimport.pl

140924 - Bug 29440: Refactor and clean up bulkmarcimport.pl
140925 - Bug 29440: Make authorities import behavior consistent with biblios
140926 - Bug 29440: Fix QA-tool issues
140927 - Bug 29440: defer biblio autolinking until records are indexed
140928 - Bug 29440: replace usage of removed GetMarcBiblio
140987 - Bug 29440: Remove pointless call to _strip_item_fields
140988 - Bug 29440: Rename $modify_biblio_marc_options to $mod_bilbio_options
140989 - Bug 29440: Only log items has been inserted if actually have been so,
and remove extra out of place logging of record insertion
143375 - Bug 29440: Replace removed syspref BiblioAddsAuthorities with
AutoLinkBiblios

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29440: Refactor and clean up bulkmarcimport.pl
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
CONFLICT (content): Merge conflict in C4/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29440: Refactor and clean up bulkmarcimport.pl
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-29440-Refactor-and-clean-up-bulkmarcimportpl-i5itTa.patch

-- 
You are receiving this mail because:
You are watching all bug changes.