diff options
author | Paul Joseph Davis <davisp@apache.org> | 2011-01-03 23:53:51 +0000 |
---|---|---|
committer | Paul Joseph Davis <davisp@apache.org> | 2011-01-03 23:53:51 +0000 |
commit | 79bea41bac270c6105427e5680f4b9716d8fd411 (patch) | |
tree | 4460bc93b7b2a252888687838ab56b4c2a6ab0b1 /src/couchdb/couch_db.erl | |
parent | 0f810b434991ffd87c3bfe2db314c385168d08a3 (diff) | |
parent | c13fc058e0e38a40d38163c158444e9d9ab4f291 (diff) |
Tagging 1.0.2
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/1.0.2@1054834 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.erl')
-rw-r--r-- | src/couchdb/couch_db.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl index 964c4704..f005a2ea 100644 --- a/src/couchdb/couch_db.erl +++ b/src/couchdb/couch_db.erl @@ -555,7 +555,8 @@ prep_and_validate_replicated_updates(Db, [Bucket|RestBuckets], [OldInfo|RestOldI {ok, #full_doc_info{rev_tree=OldTree}} -> NewRevTree = lists:foldl( fun(NewDoc, AccTree) -> - {NewTree, _} = couch_key_tree:merge(AccTree, [couch_db:doc_to_tree(NewDoc)]), + {NewTree, _} = couch_key_tree:merge(AccTree, + couch_db:doc_to_tree(NewDoc), Db#db.revs_limit), NewTree end, OldTree, Bucket), |