[Koha-bugs] [Bug 4888] pre-set of field indicators value

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

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

Julian Maurice <julian.maurice at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Failed QA                   |Does not apply

--- Comment #19 from Julian Maurice <julian.maurice at biblibre.com> 2011-08-05 10:16:32 UTC ---
Patch does not apply on master

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 4888 - pre-set of field indicators value
Using index info to reconstruct a base tree...
<stdin>:319: trailing whitespace.

<stdin>:348: trailing whitespace.
            my $query = ($type eq 'auth')?qq|SELECT
tagfield,liblibrarian,libopac,mandatory,repeatable 
<stdin>:349: trailing whitespace.
                            FROM auth_tag_structure 
<stdin>:350: trailing whitespace.
                            WHERE authtypecode=? AND tagfield=?|:qq|SELECT
tagfield,liblibrarian,libopac,mandatory,repeatable 
<stdin>:351: trailing whitespace.
                            FROM marc_tag_structure 
warning: squelched 20 whitespace errors
warning: 25 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging admin/auth_tag_structure.pl
Auto-merging cataloguing/addbiblio.pl
CONFLICT (content): Merge conflict in cataloguing/addbiblio.pl
Auto-merging installer/data/mysql/de-DE/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/de-DE/mandatory/sysprefs.sql
Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/en/mandatory/sysprefs.sql
Auto-merging
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
Auto-merging installer/data/mysql/it-IT/necessari/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/it-IT/necessari/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
Auto-merging
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
Auto-merging
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 4888 - pre-set of field indicators value
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".

-- 
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.