Return-Path: Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: (qmail 99321 invoked from network); 15 Feb 2011 15:14:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Feb 2011 15:14:56 -0000 Received: (qmail 11162 invoked by uid 500); 15 Feb 2011 15:14:56 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 10671 invoked by uid 500); 15 Feb 2011 15:14:51 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 10663 invoked by uid 99); 15 Feb 2011 15:14:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Feb 2011 15:14:50 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of boxerab@gmail.com designates 74.125.83.52 as permitted sender) Received: from [74.125.83.52] (HELO mail-gw0-f52.google.com) (74.125.83.52) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Feb 2011 15:14:42 +0000 Received: by gwb11 with SMTP id 11so116727gwb.11 for ; Tue, 15 Feb 2011 07:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=4bTuvw0qgwoXMaJt8edLzc6wxMCXpqol4rqFcRvw7yk=; b=mbiej9clz1mdoJoQkUCYkBc4+UCVWFEpxabYULeBTV3cDqrbBLOVMcC3AQ36B5LwRU FQ6VVCJPxiByFYKjus07A5SFdPApQCCcM3OdZc+W1WvrlRsRDLiy08N9dVfnyfKslooN OlaWfPYOnnvpzvwKXthpzZCCQWv3udh93wVOQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=h6nx0SL7d+1QWIXJrwViFeLTR0FPfI+sqMtjDnOm7694IX2kaJnHx3rtqkR0QtA/5X RlS41ye6j55pv0splDS0nr0cYEF+Z+i6L05xYqaEi0p1iZBAkRl/nLedMFpOlNeSiI90 beihaARwCIHs1asE90d4WKolpsv/nQnKBS3nM= MIME-Version: 1.0 Received: by 10.236.109.14 with SMTP id r14mr3752222yhg.80.1297782861919; Tue, 15 Feb 2011 07:14:21 -0800 (PST) Received: by 10.236.110.5 with HTTP; Tue, 15 Feb 2011 07:14:21 -0800 (PST) Date: Tue, 15 Feb 2011 10:14:21 -0500 Message-ID: Subject: couchdb conflict resolution From: Aaron Boxer To: dev@couchdb.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org Hello, I am very interested in understanding how conflict resolution works in couchdb: Is there a technical overview, somewhere, of how a node decides which revision wins? After a conflict is resolved, are old revisions discarded? Any technical details, short of slogging through the code, would be very welcome. Thanks, Aaron