https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38441
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply Keywords| |rel_25_05_candidate --- Comment #89 from Katrin Fischer <[email protected]> --- Tried to apply this on top of 36197, but got: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38441: New 'ILLHistoryCheck' system preference Applying: Bug 38441: atomicupdate Applying: Bug 38441: HistoryCheck Koha class Applying: Bug 38441: ILLHistoryCheck: Staff UI error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt). error: could not build fake ancestor Patch failed at 0001 Bug 38441: ILLHistoryCheck: Staff UI 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-38441-ILLHistoryCheck-Staff-UI-3hshu7iy.patch Can you please rebase ASAP? -- 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/
