D20243: ItemSync: skip handling remote items if local changes failed

David Faure noreply at phabricator.kde.org
Thu Apr 4 07:56:28 BST 2019


dfaure created this revision.
dfaure added reviewers: dvratil, vkrause.
Herald added a project: KDE PIM.
dfaure requested review of this revision.

REVISION 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.

REPOSITORY
  R165 Akonadi

BRANCH
  Applications/19.04

REVISION DETAIL
  https://phabricator.kde.org/D20243

AFFECTED FILES
  autotests/libs/itemsynctest.cpp
  src/core/itemsync.cpp

To: dfaure, dvratil, vkrause
Cc: kde-pim, dvasin, rodsevich, winterz, vkrause, mlaurent, knauss, dvratil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20190404/66594c05/attachment.html>


More information about the kde-pim mailing list