[Koha-bugs] [Bug 20588] Elasticsearch - Apply dataTable on search fields and mapping tables

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

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

--- Comment #4 from Nicolas Legrand <nicolas.legrand at bulac.fr> ---
I applied it with Jonathan autoapply :

 $ git bz apply 20588

Bug 20588 Depends on bug 20388
Follow? [(y)es, (n)o] y

Bug 20388 Depends on bug 18316
Follow? [(y)es, (n)o] y
Bug 18316 - Add weighting/relevancy options to ElasticSearch

74115 - Bug 18316: Ability to weight search fields
74116 - Bug 18316: Add weighting/relevancy options to ES query on simple search
74117 - Bug 18316: String changes

Apply? [(y)es, (n)o, (i)nteractive] y
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
Bug 20388 - Elasticsearch - Ability to add search fields from UI

73945 - Bug 20388 - Add/delete search fields from search engine configuration
page
73946 - Bug 20388 - Keep data consistency when adding/removing mapping
74261 - Bug 11674: DBRev 17.12.00.031

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20388 - Add/delete search fields from search engine configuration
page
Applying: Bug 20388 - Keep data consistency when adding/removing mapping
Applying: Bug 11674: DBRev 17.12.00.031
Using index info to reconstruct a base tree...
M       Koha.pm
A      
installer/data/mysql/atomicupdate/bug_11674-config_for_marc_field_doc_urls.sql
M       installer/data/mysql/updatedatabase.pl
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Bug 20588 - Elasticsearch - Apply dataTable on search fields and mapping tables

74241 - Bug 20588 - Apply dataTable on search fields and mapping tables

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20588 - Apply dataTable on search fields and mapping tables
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 20588 - Apply dataTable on search fields and mapping
tables

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