[Koha-bugs] [Bug 14957] Write protecting MARC fields based on source of import

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #220 from David Nind <david at davidnind.com> ---
Patch(es) no longer apply on latest master 8-( :

root at kohadevbox:koha(bz14957)$ git bz apply 14957
Bug 14957 - Write protecting MARC fields based on source of import

100052 - Bug 14957: DO NOT PUSH Schema changes
109955 - Bug 14957: Merge rules system for merging of MARC records
109956 - Bug 14957: Make preset labels translatable
109957 - Bug 14957: Adjust paging option for new version of datatables
109958 - Bug 14957: Fix rule javascript validation issue
109959 - Bug 14957: Change YUI layout to to Boostrap
109960 - Bug 14957: Remove prefetch of removed relationship
109961 - Bug 14957: Add icons for confirmation dialog and set preset based on
actions configuration
109962 - Bug 14957: Replace filter value with label if one exists
109963 - Bug 14957: Remove usage of deleted Koha::MarcMergeRulesModules

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14957: DO NOT PUSH Schema changes
Applying: Bug 14957: Merge rules system for merging of MARC records
Using index info to reconstruct a base tree...
M       cataloguing/addbiblio.pl
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
M       misc/migration_tools/bulkmarcimport.pl
M       tools/batch_record_modification.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/batch_record_modification.pl
Auto-merging misc/migration_tools/bulkmarcimport.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging cataloguing/addbiblio.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14957: Merge rules system for merging of MARC records
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-14957-Merge-rules-system-for-merging-of-MARC-r-KugWDA.patch

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