[Koha-bugs] [Bug 17015] New Koha Calendar

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |alexbuckley at catalyst.net.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #90 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Mehdi

Whilst applying this patch on a clean, up to date branch I got the following
merge error (below) the issue is C4/Reserves.pm can you please rebase against
master and I will be happy to try testing it again:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17015 - DiscreteCalendar UI, Back-End and necessary scripts
Applying: Bug 17015 - Tests for DiscreteCalendar
Applying: Bug 17015 - Koha now uses the new DiscreteCalendar module
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       C4/HoldsQueue.pm
M       C4/Overdues.pm
M       C4/Reserves.pm
M       Koha/Hold.pm
M       circ/returns.pl
M       misc/cronjobs/overdue_notices.pl
Falling back to patching base and 3-way merge...
Auto-merging misc/cronjobs/overdue_notices.pl
Auto-merging circ/returns.pl
Auto-merging Koha/Hold.pm
Auto-merging C4/Reserves.pm
CONFLICT (content): Merge conflict in C4/Reserves.pm
Auto-merging C4/Overdues.pm
Auto-merging C4/HoldsQueue.pm
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 17015 - Koha now uses the new DiscreteCalendar module
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-17015---Koha-now-uses-the-new-DiscreteCalendar-G564_m.patch
You have new mail in /var/mail/vagrant

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