http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Paola Rossi <[email protected]> --- Now I've tried to apply the patches against master 3.17.00.025 again. The first patch was 5342, and it was OK, thanks. Having read: <http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12827#c22>, and having seen some errors occurred proving: prove t/db_dependent/Letters.t I applied the patch 12953, and so the t/db_dependent/Letters.t became OK. Next applied patch was then 12830: Applying: Bug 12830: Move the order-related code into Koha::Acquisition::Order Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Letters.t CONFLICT (content): Merge conflict in t/db_dependent/Letters.t Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t Failed to merge in the changes. Patch failed at 0001 Bug 12830: Move the order-related code into Koha::Acquisition::Order And so I pass the patch 12896 to "Patch doesn't apply" status. -- 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/
