diff options
Diffstat (limited to 'src/couchdb/couch_db_updater.erl')
| -rw-r--r-- | src/couchdb/couch_db_updater.erl | 2 |
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; |