[Checkins] SVN: z3c.vcsync/trunk/src/z3c/vcsync/README.txt Extend with test of conflict resolution.

[Martijn Faassen]

Log message for revision 85636:
  Extend with test of conflict resolution.
  

Changed:
  U   z3c.vcsync/trunk/src/z3c/vcsync/README.txt

-=-
Modified: z3c.vcsync/trunk/src/z3c/vcsync/README.txt
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/README.txt	2008-04-23 11:47:35 UTC (rev 85635)
+++ z3c.vcsync/trunk/src/z3c/vcsync/README.txt	2008-04-23 12:33:05 UTC (rev 85636)
@@ -382,3 +382,36 @@
   20
   >>> data['sub']['qux'].payload
   30
+
+Conflicts
+---------
+
+Let's now generate a conflict: we change the same object in both trees
+at the same time::
+
+  >>> data['bar'].payload = 200
+  >>> current_synchronizer = s2
+  >>> data2['bar'].payload = 250
+
+Let's synchronize the second tree first::
+
+  >>> info = s2.sync("synchronize")
+
+Now we'll synchronize the first tree::
+
+  >>> current_synchronizer = s
+  >>> info = s.sync("synchronize")
+
+The conflict will have been resolved in favor of the first tree, as
+this synchronized last::
+
+  >>> data['bar'].payload
+  200
+
+When we synchronize from the second tree again, we will see the
+resolved value appear as well::
+
+  >>> current_synchronizer = s
+  >>> info = s2.sync("synchronize")
+  >>> data2['bar'].payload
+  200