couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r733917 - /couchdb/trunk/src/couchdb/couch_db_updater.erl
Date Mon, 12 Jan 2009 21:47:42 GMT
Author: damien
Date: Mon Jan 12 13:47:39 2009
New Revision: 733917

URL: http://svn.apache.org/viewvc?rev=733917&view=rev
Log:
Fix for broken conflict checking inside the db update process.

Modified:
    couchdb/trunk/src/couchdb/couch_db_updater.erl

Modified: couchdb/trunk/src/couchdb/couch_db_updater.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db_updater.erl?rev=733917&r1=733916&r2=733917&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_db_updater.erl (original)
+++ couchdb/trunk/src/couchdb/couch_db_updater.erl Mon Jan 12 13:47:39 2009
@@ -382,7 +382,7 @@
             NewConflicts = couch_key_tree:count_leafs(NewRevTree),
             if NewConflicts > OldConflicts ->
                 % if all the old docs are deletions, allow this new conflict
-                case [1 || {_Rev,{IsDel,_Sp}} <- 
+                case [1 || {_Rev,{IsDel,_Sp},_Path} <- 
                     couch_key_tree:get_all_leafs(OldTree), IsDel==false] of
                 [] ->
                     ok;



Mime
View raw message