https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19280
Jon Knight <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from Jon Knight <[email protected]> --- Patch fails to apply on my Kohadevbox VM and also on the PTFS-E sandbox: vagrant@kohadevbox:kohaclone(master)$ git bz apply 19280 Bug 19280 - CanBookBeIssued must take a Koha::Patron in parameter 66999 - Bug 19280: Pass a Koha::Patron to CanBookBeIssued Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19280: Pass a Koha::Patron to CanBookBeIssued /home/vagrant/kohaclone/.git/rebase-apply/patch:24: trailing whitespace. ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, 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 19280: Pass a Koha::Patron to CanBookBeIssued 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-19280-Pass-a-KohaPatron-to-CanBookBeIssued-qZZNx2.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/
