Dear Wiki user, You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for change notification.
The "Replication_and_conflicts" page has been changed by BrianCandler. http://wiki.apache.org/couchdb/Replication_and_conflicts?action=diff&rev1=2&rev2=3 -------------------------------------------------- - ## page was renamed from Replications_and_conflicts = Replication and conflict model = Let's take the following example to illustrate replication and conflict @@ -11, +10 @@ * On the desktop PC, she updates Bob's E-mail address. Without syncing again, she updates Bob's mobile number on the laptop. * Then she replicates the two to each other again + + So on the desktop the document has Bob's new E-mail address and his old mobile number, and on the laptop it has his old E-mail address and his new mobile number. The question is, what happens to these conflicting updated documents? @@ -356, +357 @@ == Unison == - [http://www.cis.upenn.edu/~bcpierce/unison/ Unison] is a bi-directional file + [[http://www.cis.upenn.edu/~bcpierce/unison/|Unison]] is a bi-directional file synchronisation tool. In this case, the business card would be a file, say bob.vcf. @@ -391, +392 @@ == Git == - [http://git-scm.com/ Git] is a well-known distributed source control system. + [[http://git-scm.com/|Git]] is a well-known distributed source control system. Like unison, git deals with files. However, git considers the state of a whole set of files as a single object, the "tree". Whenever you save an update, you create a "commit" which points to both the updated tree and the @@ -514, +515 @@ == Amazon Dynamo == - [http://www.allthingsdistributed.com/2007/10/amazons_dynamo.html Dynamo] + [[http://www.allthingsdistributed.com/2007/10/amazons_dynamo.html|Dynamo]] is designed as an "always writeable" key-value store, so it has no equivalent to the 409 conflict avoidance. It encourages users to perform conflict resolution on read: a read operation provides all the conflicting versions plus a
