http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6536
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Patch Status|Needs Signoff |Does not apply --- Comment #8 from Katrin Fischer <[email protected]> 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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
