[Kolab-devel] [issue4826] Unnecessary conflict after modify an appointment created by 'take remote' conflict result (rt#10111)

[Emanuel Schuetze]

Tested with Kontact enterprise35 20120229.a52dba4:

User B has write access on A's calendar folder.
Option Sync groupware changes immediately is set.

1. A: Create appointment T.
   [object on server: 1. (=T)]
2. B: Sync. Modify T to T1. (click "yes" to send an update mail)
   [server: 2. (=T1)]
3. A: Modify T to T2.
   => A gets conflict dialog.
   [server: 2. (=T1), 3. (=T2)]
4. A: Click "Take remote".
   => A's Kontact resolves conflict to T1_new.
   [server: 4. (=T1_new)]
5. B: Modify T1 to T3. (click "yes" to send an update mail)
   => B gets conflict dialog!
   [server: 4. (=T1_new), 5. (=T3)]

Expected: B's Kontact should resolve automatically this conflict between object
4. (T1_new) and 5. (T3) because the diff between 2. (T1) and 4. (T1_new) is very
small (see below) and does not justifies a conflict.

Note: If B syncs before step (5) he gets the T1_new changes and can modify
T1_new to T3 without conflict. For users it's no communicable that it's
necessary to sync in this case. Kontact should assume that T1 is the same as
T1_new and should resolve the conflict without user interaction.

Diff between 2. and 4.:
--- 2.  2012-03-01 12:11:48.308373041 +0100
+++ 4.  2012-03-01 12:12:25.445340492 +0100
@@ -9,7 +9,7 @@
   boundary="Boundary-00=_Hn1TPkqiOsunOLf"
 Status: RO
 X-Status: RT
-X-Length: 1980
+X-Length: 1998
 X-KMail-EncryptionState:  
 X-KMail-SignatureState:  
 X-KMail-MDN-Sent:

----------
assignedto: sergio
keyword: enterprise35, kde client, kkc
messages: 28600
nosy: allen, emanuel, laurent, ludwig, sergio, till, vkrause
priority: critical
status: unread
title: Unnecessary conflict after modify an appointment created by 'take remote' conflict result (rt#10111)

______________________________________
Kolab issue tracker <issues at kolab.org>
<https://roundup.kolab.org/issue4826>
______________________________________