[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

--- Comment #89 from Cab Vinton <bibliwho at gmail.com> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 14957:
<h1>Something went wrong !</h1>Applying: Bug 14957 - Rule based permission for
MARC fields
.git/rebase-apply/patch:871: trailing whitespace.
        } 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M       cataloguing/addbiblio.pl
M       koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
M       misc/migration_tools/bulkmarcimport.pl
.git/rebase-apply/patch:871: trailing whitespace.
        } 
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging misc/migration_tools/bulkmarcimport.pl
CONFLICT (content): Merge conflict in misc/migration_tools/bulkmarcimport.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
Auto-merging cataloguing/addbiblio.pl
Auto-merging C4/Biblio.pm
Patch failed at 0001 Bug 14957 - Rule based permission for MARC fields
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.
error: Failed to merge in the changes.
Bug 14957 - Write protecting MARC fields based on source of import

76208 - Bug 14957 - Rule based permission for MARC fields
76209 - Bug 14957 - Refactor and fix tests and documentation
76210 - Bug 14957 - Remove exports of removed subroutines

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-14957---Rule-based-permission-for-MARC-fields-eC50px.patch .

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