http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #41 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #40)
Problem with third patch:
Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Hi Marcel, I cannot reproduce: $ git reset --hard origin/master $ git bz apply 7825 Bug 7825 - Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force" bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Apply? [yn] y Applying: bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Bug 7825: Followup prevent submission without choosing an item Apply? [yn] y Applying: Bug 7825: Followup prevent submission without choosing an item Bug 7825: Followup values are 1, 0 or 'force' Apply? [yn] y Applying: Bug 7825: Followup values are 1, 0 or 'force' Bug 7825: FIX some ergonomic issues in opac-reserve Apply? [yn] y Applying: Bug 7825: FIX some ergonomic issues in opac-reserve -- You are receiving this mail because: You are watching all bug changes.