couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
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 GMT
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



Mime
View raw message