Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 12519 invoked from network); 7 Jul 2009 02:59:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jul 2009 02:59:42 -0000 Received: (qmail 790 invoked by uid 500); 7 Jul 2009 02:59:52 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 708 invoked by uid 500); 7 Jul 2009 02:59:51 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 698 invoked by uid 99); 7 Jul 2009 02:59:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2009 02:59:51 +0000 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2009 02:59:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6118E23888C8; Tue, 7 Jul 2009 02:59:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r791684 - in /couchdb/trunk: share/www/script/test/replication.js src/couchdb/couch_db.erl Date: Tue, 07 Jul 2009 02:59:27 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090707025927.6118E23888C8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kocolosk Date: Tue Jul 7 02:59:26 2009 New Revision: 791684 URL: http://svn.apache.org/viewvc?rev=791684&view=rev Log: fix deleted_conflicts qs parameter Modified: couchdb/trunk/share/www/script/test/replication.js couchdb/trunk/src/couchdb/couch_db.erl Modified: couchdb/trunk/share/www/script/test/replication.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/replication.js?rev=791684&r1=791683&r2=791684&view=diff ============================================================================== --- couchdb/trunk/share/www/script/test/replication.js (original) +++ couchdb/trunk/share/www/script/test/replication.js Tue Jul 7 02:59:26 2009 @@ -205,12 +205,15 @@ this.afterBA2 = function(dbA, dbB) { // open documents and include the conflict meta data - var docA = dbA.open("foo", {conflicts: true}); - var docB = dbB.open("foo", {conflicts: true}); + var docA = dbA.open("foo", {conflicts: true, deleted_conflicts: true}); + var docB = dbB.open("foo", {conflicts: true, deleted_conflicts: true}); // We should have no conflicts this time T(docA._conflicts === undefined) T(docB._conflicts === undefined); + + // They show up as deleted conflicts instead + T(docA._deleted_conflicts[0] == docB._deleted_conflicts[0]); }; } }; Modified: couchdb/trunk/src/couchdb/couch_db.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.erl?rev=791684&r1=791683&r2=791684&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_db.erl (original) +++ couchdb/trunk/src/couchdb/couch_db.erl Tue Jul 7 02:59:26 2009 @@ -822,7 +822,7 @@ case lists:member(deleted_conflicts, Options) of false -> []; true -> - case [Rev1 || #rev_info{rev=Rev1,deleted=false} <- RestInfo] of + case [Rev1 || #rev_info{rev=Rev1,deleted=true} <- RestInfo] of [] -> []; DelConflictRevs -> [{deleted_conflicts, DelConflictRevs}] end