[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

Cori Lynn Arnold <carnold at dgiinc.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |carnold at dgiinc.com

--- Comment #104 from Cori Lynn Arnold <carnold at dgiinc.com> ---
Patch doesn't apply

Bug 14957 - Write protecting MARC fields based on source of import

79368 - Bug 14957 - Rule based permission for MARC fields
79369 - Bug 14957 - Refactor and fix tests and documentation
79370 - Bug 14957 - Remove exports of removed subroutines
79890 - Bug 14957 - Add missing use in Biblio.pm

Apply? [(y)es, (n)o, (i)nteractive] y
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/modules/admin/preferences/cataloguing.pref
.git/rebase-apply/patch:871: trailing whitespace.
        }
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging cataloguing/addbiblio.pl
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 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".
Patch left in
/tmp/Bug-14957---Rule-based-permission-for-MARC-fields-WiTsgs.patch

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