diff options
| author | Jan Lehnardt <jan@apache.org> | 2010-01-23 15:29:33 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2010-01-23 15:29:33 +0000 |
| commit | 5a87b852a72cc36d4d7b64271ed542ce2a1befe0 (patch) | |
| tree | 0b2a694cedc6edb3b0fe7f783f4f894d18b15467 /src | |
| parent | f4033185bbd88d827dfc47bd58cdbfd5ec0e8866 (diff) | |
show conflicts in changes filters. Patch by Lena Herrmann. Closes COUCHDB-630
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@902422 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_httpd_db.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl index 28efc90e..dd13cb59 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -237,7 +237,7 @@ make_filter_fun(Req, Db) -> couch_util:get_nested_json_value({Props}, [<<"filters">>, FName]), fun(DocInfos) -> Docs = [Doc || {ok, Doc} <- [ - {ok, Doc} = couch_db:open_doc(Db, DInfo, [deleted]) + {ok, Doc} = couch_db:open_doc(Db, DInfo, [deleted, conflicts]) || DInfo <- DocInfos]], {ok, Passes} = couch_query_servers:filter_docs(Req, Db, DDoc, FName, Docs), [{[{rev, couch_doc:rev_to_str(Rev)}]} |