kdepim-sync plugin: conflicts, duplicate events

I get this same with 0.33 and r2599.

{{ contact sink of member 2 of type syncml-obex-client just sent all changes Conflict for Mapping 0x2aaab433e6b0: Entry 1: Member: 2 (syncml-obex-client) UID: 1935 <?xml version="1.0"?> <contact>

<EMail Type="Internet">

<Content>Heli.Virtanen@company.com</Content>

</EMail> <FormattedName?>

<Content>Heli Virtanen</Content>

</FormattedName> <Name>

<LastName?>Virtanen</LastName> <FirstName?>Heli</FirstName>

</Name> <Revision>

<Content>20071025T103018Z</Content>

</Revision>

</contact>

Entry 2: Member: 1 (kdepim-sync) UID: yqjJ5p6TWP <?xml version="1.0"?> <contact>

<EMail>

<Content>Heli.Virtanen@company.com</Content>

</EMail> <FormattedName?>

<Content>Heli Virtanen</Content>

</FormattedName> <Name>

<LastName?>Virtanen</LastName> <FirstName?>Heli</FirstName>

</Name> <Revision>

<Content>20071025T132601Z</Content>

</Revision> <Uid>

<Content>yqjJ5p6TWP</Content>

</Uid>

</contact> }}

Is this known issue with new 0.3x versions or something 0.2x specific? Should I open a new issue for 0.3x version? Is this something that could be fixed with capabilities.xml? I tried but failed.

Tuju could you try latest SVN revision - at least r2602:

------------------------------------------------------------------------
r2602 | dgollub | 2007-10-25 13:45:29 +0200 (Thu, 25 Oct 2007) | 12 lines

Changed _osync_xmlformat_subtract_points() behavoir to not influnce the collected_points. It has to
return 0 for ignored fields to not influence the collected_points. (Return value is mostly used to 
add/subtract collected_points).

Another issue - less likely:

0 Points got returned for ignored fields to avoid influence of the collected_points value and let
collected_points not raise over the threshold value. This could change the compare result to SIMILAR,
even if the entry should  MISMATCH, this should be avoided. This happens when the number of ignored fiels
is the greather equal as the thresold value.


------------------------------------------------------------------------
r2601 | dgollub | 2007-10-25 13:19:36 +0200 (Thu, 25 Oct 2007) | 3 lines

Score table has to be sorted!
Do sanity check for left-right / right-left comparing issues.

------------------------------------------------------------------------
r2600 | dgollub | 2007-10-25 13:11:29 +0200 (Thu, 25 Oct 2007) | 9 lines

Added _osync_xmlformat_subtract_points() to fix the issue with ignored
fields in xmlfield2 aka. 2nd entry. This uses _osync_xmlformat_get_points() 
but handle the case if the needs to be ignored. Ignored fields doesn't have 
influence on the compare result. This needed to keep the compare result SAME 
if an ignored fields are the only differences between the entries.

This fixes the xmlformat ignored field testcase.

This should at least fix your conflict with <Uid> since it doesn't got correctly ignored if the fields which should be ignored in the 2nd entry/right side. Not quite sure about the Type="Internet" attribute of the EMail field. Actually this should conflict as well.

Thanks for testing.

Tuju, please test it again with current svn and open another ticket if you can still reproduce this error.

I still have the same with r2646. Should capabilities.xml work? In member dir or under /usr/share/ ?

vformat will get more attention in 0.39.