http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15533 Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |hector.hecaxmmx@gmail.com Status|Needs Signoff |In Discussion --- Comment #3 from Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> --- (In reply to Frédéric Demians from comment #2)
I can't apply this patch on master. I get:
fatal: sha1 information is lacking or useless (C4/HoldsQueue.pm). error: could not build fake ancestor
Applying: Bug 15533 - Allow patrons and librarians to select itemtype when placing hold fatal: sha1 information is lacking or useless (C4/HoldsQueue.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15533 - Allow patrons and librarians to select itemtype when placing hold The copy of the patch that failed is found in: /var/koha/koha/.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-15533---Allow-patrons-and-librarians-to-select-UnO2iN.patch -- You are receiving this mail because: You are watching all bug changes.