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

Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #80 from Katrin Fischer <katrin.fisc...@bsz-bw.de> ---
I am sorry, I fixed the conflict in kohastructure.sql, but then the 4th patch
won't apply:

sloth:/usr/local/vagrant/kohaclone_master (32-18316-qa-elastic_weight|AM 1/1) $
git bz apply --continue
Applying: Bug 18316: Ability to weight search fields
Applying: Bug 18316: Add weighting/relevancy options to ES query on simple
search
Applying: Bug 18316: String changes
Applying: Bug 18316 - QA improvement - Koha::SearchField::search_marc_maps
return a result set - code refactoring for gettings weighted fields -
Koha::SearchFields::weighted_fields return a result set
error: sha1 information is lacking or useless
(Koha/SearchEngine/Elasticsearch/QueryBuilder.pm).
error: could not build fake ancestor
Patch failed at 0001 Bug 18316 - QA improvement -
Koha::SearchField::search_marc_maps return a result set - code refactoring for
gettings weighted fields - Koha::SearchFields::weighted_fields return a result
set
Use 'git am --show-current-patch' 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-18316---QA-improvement---KohaSearchFieldsearch-dKxuaY.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://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/

Reply via email to