[Koha-bugs] [Bug 22690] Merging records with many items too slow (Elasticsearch)

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

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

Joonas Kylmälä <joonas.kylmala at helsinki.fi> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |joonas.kylmala at helsinki.fi

--- Comment #12 from Joonas Kylmälä <joonas.kylmala at helsinki.fi> ---
Doesn't apply anymore:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 22690: Refactor merging of records to improve performance
(Elasticsearch)
Using index info to reconstruct a base tree...
M       C4/Items.pm
M       Koha/Biblio.pm
M       Koha/Item.pm
M       t/db_dependent/Koha/Item.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Item.t
Auto-merging Koha/Item.pm
CONFLICT (content): Merge conflict in Koha/Item.pm
Auto-merging Koha/Biblio.pm
CONFLICT (content): Merge conflict in Koha/Biblio.pm
Auto-merging C4/Items.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22690: Refactor merging of records to improve
performance (Elasticsearch)

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