summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-08-14 07:35:29 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-08-14 07:35:29 (GMT)
commit67f395298d5eb67c9a7ec126dcade1bbdd39f986 (patch)
tree59bd6c5c66339c529b1ddf61cd7277ca42e275b0
parent62beb4a1348e1d36240f1adca62a581a0979adc8 (diff)
AkAppend/Merge: always bump PimItem revision when merging
-rw-r--r--src/server/handler/akappend.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/handler/akappend.cpp b/src/server/handler/akappend.cpp
index 134d513..95d1b49 100644
--- a/src/server/handler/akappend.cpp
+++ b/src/server/handler/akappend.cpp
@@ -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);