https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38944
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #15 from David Nind <[email protected]> --- Thanks Jonatahn! I was too slow re-testing, and the patches no longer apply ... git bz apply 38944 Bug 38944 - Add Test::NoWarnings to tests without warnings 177165 - Bug 38944: Add new dependency Test::NoWarnings 177166 - Bug 38944: Add Test::NoWarnings to tests no producing warnings 177274 - Bug 38944: Manual changes 177275 - Bug 38944: Correctly catch warnings raised by DBI Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38944: Add new dependency Test::NoWarnings Applying: Bug 38944: Add Test::NoWarnings to tests no producing warnings Using index info to reconstruct a base tree... M t/Languages.t M t/db_dependent/Koha/CirculationRules.t M t/db_dependent/Koha/Holds.t M t/db_dependent/Koha/Object/Mixin/AdditionalFields.t M t/db_dependent/Languages.t M t/db_dependent/api/v1/items.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/api/v1/items.t Auto-merging t/db_dependent/Languages.t Auto-merging t/db_dependent/Koha/Object/Mixin/AdditionalFields.t Auto-merging t/db_dependent/Koha/Holds.t Auto-merging t/db_dependent/Koha/CirculationRules.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/CirculationRules.t Auto-merging t/Languages.t CONFLICT (content): Merge conflict in t/Languages.t error: Failed to merge in the changes. Patch failed at 0001 Bug 38944: Add Test::NoWarnings to tests no producing warnings -- 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/
