https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30822
David Cook <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #11 from David Cook <[email protected]> --- Went to apply it as a dependency of bug 27421 and noticed patches don't apply anymore: Bug 30822 - BatchCommit does not deal with indexation correctly 135963 - Bug 30822: Make BatchCommitRecords update the index in one request 135964 - Bug 30822: Clarify that BatchCommitItems is a private function Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30822: Make BatchCommitRecords update the index in one request Using index info to reconstruct a base tree... M C4/ImportBatch.pm Falling back to patching base and 3-way merge... Auto-merging C4/ImportBatch.pm CONFLICT (content): Merge conflict in C4/ImportBatch.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30822: Make BatchCommitRecords update the index in one request -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
