http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8836 --- Comment #46 from Juhani Seppälä <jseppal@student.uef.fi> --- (In reply to Nick Clemens from comment #45)
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
Did you mean to test the squashed patch? I didn't set anything obsolete because I'm unsure as to whether squashing these old patches like this is actually welcome at all - I was hoping for comments and reactions. I guess I shouldn't have a set "needs signoff" - sorry. I can fix the old separate patches if that's how they should be kept. -- You are receiving this mail because: You are watching all bug changes.