[NEEDINFO] Unnecessary merge conflicts (Nokia E51, syncml-obex-client+evo2-sync)

[jas]

Hi! I erased my evolution phone book, did one slow sync to pull in the phone book from my phone. This worked fine. I can do a fast sync which also works fine. But if I immediately do a slow sync, I get merge conflicts.

Some of the merge conflicts does not contain confidential information, so here is the first example:

Conflict for Mapping 0xb2722088: 
Entry 1:
Member: 2 (evo2-sync)
UID: pas-id-47B17F2300000022
<?xml version="1.0"?>
<contact>
  <FileAs>
    <Content>Kundservice</Content>
  </FileAs>
  <FormattedName>
    <Content>Kundservice</Content>
  </FormattedName>
  <Name>
    <FirstName>Kundservice</FirstName>
  </Name>
  <Revision>
    <Content>20080207T183307Z</Content>
  </Revision>
  <Telephone>
    <Content>0200222040</Content>
  </Telephone>
  <Uid>
    <Content>pas-id-47B17F2300000022</Content>
  </Uid>
</contact>


Entry 2:
Member: 1 (syncml-obex-client)
UID: 666
<?xml version="1.0"?>
<contact>
  <Name>
    <FirstName>Kundservice</FirstName>
  </Name>
  <Revision>
    <Content>20080207T183307Z</Content>
  </Revision>
  <Telephone>
    <Content>0200222040</Content>
  </Telephone>
</contact>


Which entry do you want to use? [1-9] To select a side, [D]uplicate: 

It seems to me that the evo2 plugin modifies the vcard so that it no longer matches the vcard it receives from the phone.

Is the evo2 plugin buggy here? Or should the opensync framework be able to detect and merge the differences here?

Thanks!

[tuju]

This looks like 'Fake conflict' in ticket #883. Have you tried this recently? It's not evolution dependent.

[dgollub]

Do you have any "capabilities" set for evo2-sync? If not the conflict is "FileAs?" - i guess.

[ianmartin]

The evolution data store itself adds the extra fields when the contact is added to the address book. So it is not a bug in the evolution connector.

I think it is syncml-obex-client that is lacking capbilities.xml This would let opensync know that the phone does not support FileAs?, FormattedName? and Uid

Could you create a fresh group, then: Copy $OSYNC_INSTALL_DIR/install/share/libopensync1/capabilities/reference.xml to $OPENSYNC_CONFIG_DIR/group<N>/<syncml-obex-client>/capabilities.xml

where <N> is the group number and <syncml-obex-client> is the directory with syncml-obex-client.conf in it (Either '1' or '2' depending on the order you configure the group)

Now open capabilities.xml and delete the entries for FileAs?, FormattedName? and Uid.

Does the problem still exist? Thanks

PS: I suppose the only way to deal with such peers that add entries on creation is to read the data back out and see what happened to it. But that sounds a bit like recursive syncing...!