From e682127ca50b7a1e9a0643412a9e89cfabd5b7a6 Mon Sep 17 00:00:00 2001 From: "Damien F. Katz" Date: Mon, 12 Jan 2009 21:47:39 +0000 Subject: 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 --- src/couchdb/couch_db_updater.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/couchdb/couch_db_updater.erl') 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; -- cgit v1.2.3