[Koha-bugs] [Bug 6536] Z3950 Enhancements: SRU targets, MARC conversion, additional XSLT processing

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
       Patch Status|Needs Signoff               |Does not apply

--- Comment #8 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 06:07:11 UTC ---
Hi Marcel,

this looks like a very interesting feature. There are some conflicts for the
second patch:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: 6536: Z3950 Enhancements (DB Revision)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 6536: Z3950 Enhancements (DB Revision)
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".

Could you perhaps fix and resubmit? I will try to test soon after you did,
according to the test plan on the wiki.

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