summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2009-01-12 21:47:39 +0000
committerDamien F. Katz <damien@apache.org>2009-01-12 21:47:39 +0000
commite682127ca50b7a1e9a0643412a9e89cfabd5b7a6 (patch)
tree92a7abfac33a09b64aa0d358931e2731a74d1a37
parent7ec87a86a24d0f0d96d7df417e2f1c46ddc6fbfa (diff)
Fix for broken conflict checking inside the db update process.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@733917 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/couchdb/couch_db_updater.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl
index cbeda223..a6fd0cc6 100644
--- a/src/couchdb/couch_db_updater.erl
+++ b/src/couchdb/couch_db_updater.erl
@@ -382,7 +382,7 @@ merge_rev_trees(NoConflicts, [NewDocs|RestDocsList],
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;