https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29087
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #15 from David Nind <[email protected]> --- The patch no longer applies: git bz apply 29087 Bug 29087 - Holds to pull list can crash with a SQL::Abstract puke 127859 - Bug 29087: Prevent filter_by_for_hold to crash if default holdallowed is not_allowed 164936 - Bug 29087: Add unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29087: Prevent filter_by_for_hold to crash if default holdallowed is not_allowed Using index info to reconstruct a base tree... M Koha/Items.pm M t/db_dependent/Koha/Holds.t M t/db_dependent/Koha/Items.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Items.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Items.t Auto-merging t/db_dependent/Koha/Holds.t Auto-merging Koha/Items.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 29087: Prevent filter_by_for_hold to crash if default holdallowed is not_allowed -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ 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/
