Commit 67f39529 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

AkAppend/Merge: always bump PimItem revision when merging

parent 62beb4a1
......@@ -154,9 +154,9 @@ bool AkAppend::mergeItem(const Protocol::CreateItemCommand &cmd,
{
QSet<QByteArray> changedParts;
if (newItem.rev() > 0) {
currentItem.setRev(newItem.rev());
}
// Always bump revision
currentItem.setRev(qMax(newItem.rev(), currentItem.rev()) + 1);
if (!newItem.remoteId().isEmpty() && currentItem.remoteId() != newItem.remoteId()) {
currentItem.setRemoteId(newItem.remoteId());
changedParts.insert(AKONADI_PARAM_REMOTEID);
......
Supports Markdown
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