[Koha-bugs] [Bug 22806] CanBookBeReserve and CanItemBeReserve do not check AllowHoldsOnPatronsPossessions

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #47 from David Nind <david at davidnind.com> ---
I tried to retest, but the patches no longer apply 8-(

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 22806: CanBookBeReserved and CanItemBeReserved must check
AllowHoldsOnPatronsPossessions
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Reserves.pm
Applying: Bug 22806: (follow-up) CanBookBeReserved and CanItemBeReserved must
check AllowHoldsOnPatronsPossessions
Applying: Bug 22806: Unit Tests
Using index info to reconstruct a base tree...
M       t/db_dependent/ILSDI_Services.t
M       t/db_dependent/Reserves.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Reserves.t
CONFLICT (content): Merge conflict in t/db_dependent/Reserves.t
Auto-merging t/db_dependent/ILSDI_Services.t
CONFLICT (content): Merge conflict in t/db_dependent/ILSDI_Services.t
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22806: Unit Tests
The copy of the patch that failed is found in: .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-22806-Unit-Tests-Z7uKNQ.patch

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