Skip to content
Commit 25759819 authored by David Faure's avatar David Faure
Browse files

ItemSync: skip handling remote items if local changes failed

Summary:
The infamous "Multiple merge candidates" error would still leave ItemSync
in a forever-stuck state when mRemoteItemsQueue was not empty.

Reproduced by adding a unittest that calls setFullSyncItems (with
a duplicate item), while the existing unittest for a duplicate item
was callling setIncrementalSyncItems().

I barely understand what I'm doing, please review carefully.

Test Plan: Unittest passes.

Reviewers: dvratil, vkrause

Reviewed By: dvratil

Subscribers: asn, kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D20243
parent ec753bd5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment