diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2010-11-16 13:50:13 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-12-01 12:32:47 +0100 |
| commit | 00458dee4def2fdc326dce47d4e655266c9cd545 (patch) | |
| tree | 48919def85bb6369c1dbe0af94924736614176da | |
| parent | 391e1fd5554fd09597ca3eb626a308db497ec61a (diff) | |
calendar fields: ignore changes to alarm UID
The alarm UID (= X-EVOLUTION-ALARM-UID) is not user visible, so
changes in it can be ignored, aka not relevant = compare="never".
During conflict resolution it is better to not remove an existing
value: merge="fillempty". A better solution would be to have accurate
information whether a peer stores it (not done correctly in some
local sync scenarios).
| -rw-r--r-- | src/syncevo/configs/datatypes/10calendar-fieldlist.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/syncevo/configs/datatypes/10calendar-fieldlist.xml b/src/syncevo/configs/datatypes/10calendar-fieldlist.xml index 3dbd628f..a3d9d240 100644 --- a/src/syncevo/configs/datatypes/10calendar-fieldlist.xml +++ b/src/syncevo/configs/datatypes/10calendar-fieldlist.xml @@ -65,7 +65,7 @@ <field name="ALARM_MSG" type="string" compare="conflict/scripted"/> <field name="ALARM_ACTION" type="string" compare="conflict/scripted"/> <field name="ALARM_REL" type="integer" compare="never/scripted"/> - <field name="ALARM_UID" type="string" compare="conflict/scripted"/> + <field name="ALARM_UID" type="string" compare="never" merge="fillempty"/> <!-- non-standard --> <field name="PARENT_UID" type="string" compare="never/scripted"/> |