diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-03-09 19:09:11 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-03-09 19:09:11 +0000 |
| commit | 772fdde2eb970177438038a2479ec13385372cf5 (patch) | |
| tree | f193e46bb51a99a533bdb13506c8e5fe248f0103 /src/couchdb/couch_db.hrl | |
| parent | 0d09aa9f79680be83e9893882bded0f4d8ba8b8d (diff) | |
Merged revision 1079939 from trunk
Parameter "include_docs" now honors parameter "conflicts"
When querying a map view, /db/_all_docs/ or /db/_changes/ with
"include_docs=true", if "conflicts=true" is given as well, the
documents will contain the conflicts list (if there are conflicting
revisions).
Closes COUCHDB-549.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1079941 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.hrl')
| -rw-r--r-- | src/couchdb/couch_db.hrl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl index 6b6c6440..003cb688 100644 --- a/src/couchdb/couch_db.hrl +++ b/src/couchdb/couch_db.hrl @@ -177,6 +177,7 @@ view_type = nil, include_docs = false, + conflicts = false, stale = false, multi_get = false, callback = nil, @@ -271,6 +272,7 @@ timeout, filter = "", include_docs = false, + conflicts = false, db_open_options = [] }). |