[Koha-bugs] [Bug 12487] C4::Contract.pm : Replacement of subroutine calls of C4::SQLHelper by DBIx::Class

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12487

Kyle M Hall <kyle at bywatersolutions.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |kyle at bywatersolutions.com

--- Comment #2 from Kyle M Hall <kyle at bywatersolutions.com> ---
Applying: Bug 12487: SQLHelper replacement - C4::Contract
fatal: sha1 information is lacking or useless (C4/Contract.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 12487: SQLHelper replacement - C4::Contract
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-12487-SQLHelper-replacement---C4Contract-XbEHYe.patch
kohaqa-koha at koha-dev:~/kohaclone$ patch -p1 <
/tmp/Bug-12487-SQLHelper-replacement---C4Contract-XbEHYe.patch
patching file C4/Contract.pm
Hunk #1 FAILED at 21.
Hunk #2 FAILED at 78.
Hunk #3 FAILED at 113.
3 out of 3 hunks FAILED -- saving rejects to file C4/Contract.pm.rej
patching file t/db_dependent/Contract.t
Hunk #1 FAILED at 21.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 50.
Hunk #4 FAILED at 70.
Hunk #5 FAILED at 96.

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