https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26181
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #4 from David Nind <[email protected]> --- Patch no longer applies 8-( : root@kohadevbox:koha(bz26181)$ git bz apply 26181 Bug 26181 - Holds placed via the REST API should not be forced by default even if AllowHoldPolicyOverride is enabled 108016 - Bug 26181: regression tests 108017 - Bug 26181: Disable override by default in /holds Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 26181: regression tests Using index info to reconstruct a base tree... M t/db_dependent/api/v1/holds.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/api/v1/holds.t CONFLICT (content): Merge conflict in t/db_dependent/api/v1/holds.t error: Failed to merge in the changes. Patch failed at 0001 Bug 26181: regression tests The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-26181-regression-tests-FLFBjo.patch Question: Do I need to post the message for the patch failing, or is it okay to just say that the patch no longer applies? -- 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/
