https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29539
--- Comment #25 from Marcel de Rooy <[email protected]> --- (In reply to Katrin Fischer from comment #24) > Hi Marcel, I tried to apply the patches in the attached sequence and the > other way around, I always end up with: > > Apply? [(y)es, (n)o, (i)nteractive] i > Applying: Bug 29539: (follow-up) remove tag_onesubject template > error: sha1 information is lacking or useless > (koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl). > error: could not build fake ancestor > Patch failed at 0001 Bug 29539: (follow-up) remove tag_onesubject template > 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-29539-follow-up-remove-tagonesubject-template-daluwkeh.patch > kohadev-koha@kohadevbox:koha(master|AM 1/1)$ git log > > Can you please check/rebase on latest master? I would be happy to leave that to the author. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
