http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7710
Christopher Brannon <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #61 from Christopher Brannon <[email protected]> --- I am unable to test. When applying patch 9394, I get the following: The sandbox you've requested is not ready. Some problems occurred applying patches from bug 9394: <h1>Something went wrong !</h1>Applying: Bug 9394: Use reserve_id where possible Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Biblio.pm Auto-merging C4/ILSDI/Services.pm Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/SIP/ILS/Transaction/Hold.pm CONFLICT (content): Merge conflict in C4/SIP/ILS/Transaction/Hold.pm Auto-merging circ/circulation.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt Auto-merging reserve/request.pl CONFLICT (content): Merge conflict in reserve/request.pl Auto-merging serials/routing-preview.pl Auto-merging t/db_dependent/Holds.t CONFLICT (add/add): Merge conflict in t/db_dependent/Holds.t Failed to merge in the changes. Patch failed at 0001 Bug 9394: Use reserve_id where possible 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. Bug 9394 - Use reserve_id where possible 19902 - Bug 9394: Use reserve_id where possible 19904 - Bug 9394: QA Followup 19905 - Bug 9394: (follow-up) modernize test cases 19906 - Bug 9394: (follow-up) silence spurious warns 19907 - Bug 9394: (follow-up) restore ability to cancel holds from the patron summary 19908 - Bug 9394: (follow-up) fix query column alias 19909 - Bug 9394: (follow-up) stylistic tidying Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-9394-Use-reserveid-where-possible-oBVhgG.patch . I am using a sandbox, so this is as far as I got in testing. I will not go any further until I get further instructions. Does 7710 still depend on 9394? Should I ignore this error and proceed? Christopher -- You are receiving this mail because: 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/
