dovecot-2.2: dsync: Ignore GUID mismatch on expunged message pair.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/1d88f01ba2aa
changeset: 15694:1d88f01ba2aa
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jan 31 17:01:46 2013 +0200
description:
dsync: Ignore GUID mismatch on expunged message pair.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r 070ca24e5846 -r 1d88f01ba2aa src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Thu Jan 31 00:14:28 2013 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Thu Jan 31 17:01:46 2013 +0200
@@ -991,8 +991,10 @@
 
 	i_assert(local_change->type == DSYNC_MAIL_CHANGE_TYPE_EXPUNGE);
 	if (!dsync_mail_change_guid_equals(local_change, change->guid)) {
-		/* mismatch - found the first non-common UID */
-		dsync_mailbox_common_uid_found(importer);
+		/* GUID mismatch for two expunged mails. dsync can't update
+		   GUIDs for already expunged messages, so we can't immediately
+		   determine that the rest of the messages are a mismatch. so
+		   for now we'll just skip over this pair. */
 	} else {
 		importer->last_common_uid = change->uid;
 	}