https://bugs.meego.com/show_bug.cgi?id=22783

--- Comment #1 from pohly <[email protected]> 2011-10-26 13:37:43 UTC ---
commit 739920c59e914ae077170c244d5d14cbf29630bd
Author: Patrick Ohly <[email protected]>
Date:   Fri Sep 30 18:27:50 2011 +0200

    testing: improved tests for add<->add conflicts (BMC #22783)

    When avoiding conflicting properties with merge=lines, items are
    completely replaced as originally expected. This allows testing the
    "server avoids unnecessary updates" aspect of add<->add conflict
    resolution.

    With an up-to-date libsynthesis (age comparison fixed, COMPARESCRIPT()
    fixed, suppress unneeded local and remote updates, fix statistics in
    server mode) these tests pass in server (local sync/CalDAV) and
    client mode (with SyncEvolution as server).

    Thus BMC #22783 is almost resolved, except for the open question
    whether merge=lines is desirable in this case.

--------
Product: SyncEvolution
Component: SyncEvolution
MeeGo Release: unspecified
Severity: normal
Priority: High
Keywords: 
Status: ASSIGNED
Who: [email protected]
Assigned To: [email protected]
Target Build: ---
Flags: 
Changed: 
--------

https://bugs.meego.com/show_bug.cgi?id=22783


-- 
Configure bugmail: https://bugs.meego.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching someone on the CC list of the bug.
_______________________________________________
Syncevolution-issues mailing list
[email protected]
http://lists.syncevolution.org/listinfo/syncevolution-issues

Reply via email to