https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14364 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #54 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, but patches no longer apply, could you please rebase? Bug 14364 - Allow automatically canceled expired waiting holds to fill the next hold 128757 - Bug 14364: Allow automatically canceled expired waiting holds to fill the next hold 128758 - Bug 14364: (QA follow-up) Generate message for transfers as well 128759 - Bug 14364: (follow-up) Cleanup duplicate code and adjust notices and prefs Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14364: Allow automatically canceled expired waiting holds to fill the next hold Using index info to reconstruct a base tree... M C4/Reserves.pm M Koha/Hold.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging Koha/Hold.pm Auto-merging C4/Reserves.pm Applying: Bug 14364: (QA follow-up) Generate message for transfers as well Applying: Bug 14364: (follow-up) Cleanup duplicate code and adjust notices and prefs error: sha1 information is lacking or useless (C4/Reserves.pm). error: could not build fake ancestor Patch failed at 0001 Bug 14364: (follow-up) Cleanup duplicate code and adjust notices and prefs hint: Use 'git am --show-current-patch=diff' to see the failed 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-14364-follow-up-Cleanup-duplicate-code-and-adj-QGOiaL.patch -- You are receiving this mail because: You are watching all bug changes.