From d87c789f311b7727d2db687e3891319e98ad6535 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 14 Aug 2017 09:03:24 -0600
Subject: Skip over revisions that we can't replay.

---
 examples/imapresource/imapresource.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'examples/imapresource/imapresource.cpp')

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 96055b4..0c0c134 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -621,7 +621,11 @@ public:
     {
         if (operation != Sink::Operation_Creation) {
             if(oldRemoteId.isEmpty()) {
-                return KAsync::error<QByteArray>("Tried to replay modification without old remoteId.");
+                // return KAsync::error<QByteArray>("Tried to replay modification without old remoteId.");
+                qWarning() << "Tried to replay modification without old remoteId.";
+                // Since we can't recover from the situation we just skip over the revision.
+                // FIXME figure out how we can ever end up in this situation
+                return KAsync::null<QByteArray>();
             }
         }
         auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort, &mSessionCache);
-- 
cgit v1.2.3