[Koha-bugs] [Bug 34862] blocking_errors.inc not included everywhere

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34862

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #24 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, but this no longer applies and I don't see how to fix - please rebase.
I'll keep checking and push once ready.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 34862: [DO NOT PUSH] add script
Applying: Bug 34862: Remove blocking_errors where there is no main
Applying: Bug 34862: Include messages.inc
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt).
error: could not build fake ancestor
Patch failed at 0001 Bug 34862: Include messages.inc
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-34862-Include-messagesinc-tp2ov_ox.patch

-- 
You are receiving this mail because:
You are watching all bug changes.