http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9805
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #21 from Katrin Fischer <[email protected]> --- Sorry, but the second patch doesn't apply: $ git bz apply 9805 Bug 9805 - Lost items are un-lost if returned, but not if renewed. 38432 - Bug 9805 - Lost items are un-lost if returned, but not if renewed. 38433 - Bug 9805 [QA Followup] - Control renewing and finding of list items via circ rules Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 9805 - Lost items are un-lost if returned, but not if renewed. Applying: Bug 9805 [QA Followup] - Control renewing and finding of list items via circ rules fatal: sha1 information is lacking or useless (C4/Circulation.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 9805 [QA Followup] - Control renewing and finding of list items via circ rules The copy of the patch that failed is found in: /home/katrin/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-9805-QA-Followup---Control-renewing-and-findin-VqfKfD.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
