https://bugs.kde.org/show_bug.cgi?id=335090
Grégory Oestreicher <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Latest Commit| |http://commits.kde.org/kdep | |im-runtime/44d38d363d6ff7b4 | |f8c892becfb58a0339dbef0e Status|CONFIRMED |RESOLVED Resolution|--- |FIXED Version Fixed In| |4.14.10 --- Comment #54 from Grégory Oestreicher <[email protected]> --- Git commit 44d38d363d6ff7b4f8c892becfb58a0339dbef0e by Grégory Oestreicher. Committed on 18/06/2015 at 20:59. Pushed by goestreicher into branch 'KDE/4.14'. Add simple conflict handling The conflict dialog will only be shown for local update / remote update conflicts. For cases where one side deleted the item while it was updated on the other, the deleting side loses the conflict automatically to prevent data loss. Related: bug 338570 FIXED-IN: 4.14.10 M +30 -0 resources/dav/common/davitemdeletejob.cpp M +13 -0 resources/dav/common/davitemdeletejob.h M +5 -4 resources/dav/common/davitemfetchjob.cpp M +2 -3 resources/dav/common/davitemfetchjob.h M +32 -2 resources/dav/common/davitemmodifyjob.cpp M +13 -0 resources/dav/common/davitemmodifyjob.h M +5 -0 resources/dav/common/davjobbase.cpp M +5 -0 resources/dav/common/davjobbase.h M +168 -8 resources/dav/resource/davgroupwareresource.cpp M +8 -0 resources/dav/resource/davgroupwareresource.h http://commits.kde.org/kdepim-runtime/44d38d363d6ff7b4f8c892becfb58a0339dbef0e -- You are receiving this mail because: You are the assignee for the bug. _______________________________________________ Kdepim-bugs mailing list [email protected] https://mail.kde.org/mailman/listinfo/kdepim-bugs
