[Akonadi] [Bug 338658] GMail, Novell Groupwise, other IMAP: "Multiple merge candidates, aborting"

[Daniel Vrátil]

https://bugs.kde.org/show_bug.cgi?id=338658

Daniel Vrátil <dvratil at kde.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
      Latest Commit|https://commits.kde.org/kde |https://commits.kde.org/ako
                   |pimlibs/ffa20e75f388bfa8753 |nadi/66b87061f523e392236d73
                   |0e113641f0830a5a58ec4       |dea668ddf6772eb545
   Version Fixed In|15.08.2                     |5.4.1
             Status|REOPENED                    |RESOLVED

--- Comment #60 from Daniel Vrátil <dvratil at kde.org> ---
Git commit 66b87061f523e392236d73dea668ddf6772eb545 by Daniel Vrátil.
Committed on 07/01/2017 at 11:07.
Pushed by dvratil into branch 'Applications/16.12'.

Reset Item RID on both inter- and intra-resource MOVE

This should significantly help to mitigate the "Multiple Merge
Candidates" error during sync. One of the major reasons why MMC
happens is when user moves an Item belonging to an IMAP resource
to another Collection. On IMAP RID corresponds to IMAP UID. If
you move such an Item into another Collection which has IMAP
UIDNEXT greater than the source Collection, then there's a high
chance for RID conflict until the Resource replays the change
and updates the RID of the moved Item.

This change reset RID of all moves Items and only emits the RID
as part of the change notification. The Monitor then retrieves the
Item without the RID and restores the RID from the Notification,
so this is absolutely transparent to Resources.
FIXED-IN: 5.4.1

M  +7    -0    src/core/monitor_p.cpp
M  +13   -19   src/server/handler/move.cpp

https://commits.kde.org/akonadi/66b87061f523e392236d73dea668ddf6772eb545

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.