[Koha-bugs] [Bug 18242] Remove primary key on old_issues.issue_id

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18242

--- Comment #19 from Mason James <mtj at kohaaloha.com> ---
Hi, the atches don't appear to work for 16.05.x:
If this is needed, please provide patches for 16.05.x

-----------
mason at xen1:~/g/k/16.05.x$ git bz apply 18242
Bug 18242 - Remove primary key on old_issues.issue_id

61254 - Bug 18242: [SOLUTION 2]Add tests
61255 - Bug 18242: [SOLUTION 2]Handle correctly move to old_issues
61794 - Bug 18242: 16.11.x adaptation - Old::Checkouts vs OldIssues

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 18242: [SOLUTION 2]Add tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Circulation/Returns.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation/Returns.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation/Returns.t
Failed to merge in the changes.
Patch failed at 0001 Bug 18242: [SOLUTION 2]Add tests
The copy of the patch that failed is found in:
   /home/mason/g/k/16.05.x/.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-18242-SOLUTION-2Add-tests-uyNJwm.patch

-- 
You are receiving this mail because:
You are watching all bug changes.