[Koha-bugs] [Bug 8836] Resurrect Rotating Collections

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

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

Nick Clemens <nick at quecheelibrary.org> changed:

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

--- Comment #45 from Nick Clemens <nick at quecheelibrary.org> ---
Could not apply on VM or sandbox

Applying: Bug 8836 - Resurrect Rotating Collections - QA Followup
Applying: Bug 8836 - Resurrect Rotating Collections - Followup 2 - Perltidy
rotating collections scripts
/home/nick/koha/.git/rebase-apply/patch:59: trailing whitespace.
        "INSERT INTO collections ( colId, colTitle, colDesc ) 
/home/nick/koha/.git/rebase-apply/patch:211: trailing whitespace.
        "SELECT 
/home/nick/koha/.git/rebase-apply/patch:373: trailing whitespace.
        "DELETE FROM collections_tracking 
/home/nick/koha/.git/rebase-apply/patch:424: trailing whitespace.
        "SELECT barcode FROM items, collections_tracking 
/home/nick/koha/.git/rebase-apply/patch:471: trailing whitespace.
"SELECT holdingbranch, colBranchcode FROM items, collections,
collections_tracking 
fatal: sha1 information is lacking or useless
(rotating_collections/addItems.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 8836 - Resurrect Rotating Collections - Followup 2 -
Perltidy rotating collections scripts
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-8836---Resurrect-Rotating-Collections---Follow-hvjidv.patch

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