[Koha-bugs] [Bug 27344] Implement Elastic's update_index_background using Koha::BackgroundJob

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

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

Arthur Suzuki <arthur.suzuki at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |arthur.suzuki at biblibre.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #25 from Arthur Suzuki <arthur.suzuki at biblibre.com> ---
Patch doesn't apply on current master for me :
<pre>
arthur at h:~/repos/koha :  $ git bz apply 27344
Bug 27344 - Implement Elastic's update_index_background using
Koha::BackgroundJob

114877 - Bug 27344: Implement Elastic's update_index_background using
Koha::BackgroundJob
116252 - Bug 27344: Set job.borrowernumber to undef if enqueued from cli script
116931 - Bug 27344: Add --job-type to background_jobs_worker.pl

Apply? [(y)es, (n)o, (i)nteractive] y
Application de  Bug 27344: Implement Elastic's update_index_background using
Koha::BackgroundJob
Utilisation de l'information de l'index pour reconstruire un arbre de base...
M       Koha/BackgroundJob.pm
M       Koha/SearchEngine/Elasticsearch/Indexer.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
M       misc/background_jobs_worker.pl
Retour à un patch de la base et fusion à 3 points...
Fusion automatique de misc/background_jobs_worker.pl
CONFLIT (contenu) : Conflit de fusion dans misc/background_jobs_worker.pl
Fusion automatique de
koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
CONFLIT (contenu) : Conflit de fusion dans
koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
Fusion automatique de Koha/SearchEngine/Elasticsearch/Indexer.pm
Fusion automatique de Koha/BackgroundJob.pm
CONFLIT (contenu) : Conflit de fusion dans Koha/BackgroundJob.pm
error: Échec d'intégration des modifications.
l'application de la rustine a échoué à 0001 Bug 27344: Implement Elastic's
update_index_background using Koha::BackgroundJob
astuce: Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en
échec
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-27344-Implement-Elastics-updateindexbackground-HVa3WT.patch
</pre>

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