Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: Apache Wiki <wikidiffs@apache.org>
To: Apache Wiki <wikidiffs@apache.org>
Date: Fri, 30 Oct 2009 13:09:45 -0000
Message-ID: <20091030130945.27790.23782@eos.apache.org>
Subject: 
 =?utf-8?q?=5BCouchdb_Wiki=5D_Trivial_Update_of_=22Replication=5Fand=5Fcon?=
 =?utf-8?q?flicts=22_by_BrianCandler?=

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for c=
hange notification.

The "Replication_and_conflicts" page has been changed by BrianCandler.
http://wiki.apache.org/couchdb/Replication_and_conflicts?action=3Ddiff&rev1=
=3D2&rev2=3D3

--------------------------------------------------

- ## page was renamed from Replications_and_conflicts
  =3D Replication and conflict model =3D
  =

  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 m=
obile number, and on the laptop it has his old E-mail address and his new m=
obile number.
  =

  The question is, what happens to these conflicting updated documents?
  =

@@ -356, +357 @@

  =

  =3D=3D Unison =3D=3D
  =

- [http://www.cis.upenn.edu/~bcpierce/unison/ Unison] is a bi-directional f=
ile
+ [[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 @@

  =

  =3D=3D Git =3D=3D
  =

- [http://git-scm.com/ Git] is a well-known distributed source control syst=
em.
+ [[http://git-scm.com/|Git]] is a well-known distributed source control sy=
stem.
  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 t=
he
@@ -514, +515 @@

  =

  =3D=3D Amazon Dynamo =3D=3D
  =

- [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 equiva=
lent to the
  409 conflict avoidance. It encourages users to perform conflict resolution
  on read: a read operation provides all the conflicting versions plus a