https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18316
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #62 from Séverine Queune <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 18316: <h1>Something went wrong !</h1>Applying: Bug 18316: Ability to weight search fields Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 18316: Ability to weight search fields The copy of the patch that failed is found in: .git/rebase-apply/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. Bug 18316 - Add weighting/relevancy options to ElasticSearch 75526 - Bug 18316: Ability to weight search fields 75527 - Bug 18316: Add weighting/relevancy options to ES query on simple search 75528 - Bug 18316: String changes 75529 - 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 75530 - Bug 18316: Change search field weight field to decimal 75531 - Bug 18316: Update Koha/Schema/Result/SearchField.pm Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-18316-Ability-to-weight-search-fields-MFIcJl.patch . Same result on my test instance :/ -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
