https://bugs.kde.org/show_bug.cgi?id=338658
--- Comment #132 from Daniel Vrátil <dvra...@kde.org> --- Git commit 8f230d7d7f8a4e2b97273585374a68902b5ef6cf by Daniel Vrátil. Committed on 31/05/2019 at 11:21. Pushed by dvratil into branch 'master'. Automatic recovery from Multiple Merge Candidates error Summary: Introduce a recovery codepath when Multiple Merge Candidates error occurs during Item merging. Since clients generally do not use merging, this really only happens during ItemSync. In such case we quitely delete all the conflicting items from the database and reschedule the collection sync. The next sync should then succeed and bring the collection into a consistent state. Note that this does not fix the Multiple Merge Candidates bug - it can still happen (and we still don't know how), but Akonadi should now be able to recover from it automatically without user intervention, thus making this issue less of a PITA. Test Plan: Successfuly auto-recovered a broken collection on my setup. Reviewers: #kde_pim, dfaure Reviewed By: dfaure Subscribers: vkrause, dfaure, ngraham, asturmlechner, kde-pim Tags: #kde_pim Differential Revision: https://phabricator.kde.org/D21455 M +3 -3 autotests/server/fakedatastore.cpp M +1 -1 autotests/server/fakedatastore.h M +65 -4 src/server/handler/itemcreatehandler.cpp M +4 -0 src/server/handler/itemcreatehandler.h M +18 -16 src/server/storage/datastore.cpp M +3 -1 src/server/storage/datastore.h https://commits.kde.org/akonadi/8f230d7d7f8a4e2b97273585374a68902b5ef6cf -- You are receiving this mail because: You are watching all bug changes.
