[Koha-bugs] [Bug 6874] File upload in MARC

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6874

--- Comment #14 from claire.hernandez at biblibre.com <claire.hernandez at biblibre.com> 2011-12-02 14:44:15 UTC ---
Forget it, this patch have conflicts better message with 3 way merge in git bz.

$ git bz apply 6874
Bug 6874 - File upload in MARC

Patch
Apply? [yn] y

Applying: Bug 6874: Adds the ability to upload a file for a subfield
Using index info to reconstruct a base tree...
<stdin>:329: trailing whitespace.
    return $string; 
<stdin>:555: trailing whitespace.
    <script type="text/javascript" src="[% yuipath
%]/utilities/utilities.js"></script> 
<stdin>:564: trailing whitespace.
            var doc   = opener.document; 
<stdin>:611: trailing whitespace.
    <script type="text/javascript" src="[% yuipath
%]/utilities/utilities.js"></script> 
<stdin>:620: trailing whitespace.
            var doc   = opener.document; 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
Auto-merging catalogue/detail.pl
CONFLICT (content): Merge conflict in catalogue/detail.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging kohaversion.pl
CONFLICT (content): Merge conflict in kohaversion.pl
Auto-merging opac/opac-detail.pl
CONFLICT (content): Merge conflict in opac/opac-detail.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 6874: Adds the ability to upload a file for a subfield
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Patch left in /tmp/Patch-ExUoch.patch


(In reply to comment #13)

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.