[Koha-bugs] [Bug 11999] Add two checks in CanBookBeReserved and CanItemBeReserved

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

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

David Nind <david at davidnind.com> changed:

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

--- Comment #109 from David Nind <david at davidnind.com> ---
Hi Arthur, I thought I would test again but the patch no longer applies 8-( :

root at kohadevbox:koha(bz11999)$ git bz apply 11999
Bug 11999 - Add two checks in CanBookBeReserved and CanItemBeReserved

99927 - Bug 11999: Add maxreserves check in CanBookBeReserved and
CanItemBeReserved
106481 - Bug 11999: Test improvements + check maxreserves
106494 - Bug 11999: QA follow-up

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11999: Add maxreserves check in CanBookBeReserved and
CanItemBeReserved
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       reserve/request.pl
Falling back to patching base and 3-way merge...
Auto-merging reserve/request.pl
Auto-merging C4/Reserves.pm
CONFLICT (content): Merge conflict in C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 11999: Add maxreserves check in CanBookBeReserved and
CanItemBeReserved
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-11999-Add-maxreserves-check-in-CanBookBeReserv-WtX_N_.patch

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