https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30182
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from David Nind <[email protected]> --- Patch no longer applies 8-( git bz apply 30182 Bug 30182 - background_jobs.status should be an ENUM 131109 - Bug 30182: Make background_jobs.status an ENUM 131110 - Bug 30182: DBIC update Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30182: Make background_jobs.status an ENUM Applying: Bug 30182: DBIC update Using index info to reconstruct a base tree... M Koha/Schema/Result/BackgroundJob.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/BackgroundJob.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/BackgroundJob.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30182: DBIC update hint: Use 'git am --show-current-patch=diff' to see the failed patch Testing notes: - Before patch is applied show details for column in the database: . show create table background_jobs; . select * from background_jobs where status=0; - After patch is applied: should show enum values as per the patch -- 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/
