diff options
| author | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
|---|---|---|
| committer | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
| commit | 39de3072bcf9fdeec6d3faeb125924c401242205 (patch) | |
| tree | da55307c8762f9ff16f7a7e478d971c0f352d281 /src/couchdb/couch_doc.erl | |
| parent | 53968ddfd93bfe1aa403478de715ae0ac77db177 (diff) | |
Merged mochiweb branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_doc.erl')
| -rw-r--r-- | src/couchdb/couch_doc.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl index a9ef55f7..1ced93b3 100644 --- a/src/couchdb/couch_doc.erl +++ b/src/couchdb/couch_doc.erl @@ -128,13 +128,12 @@ to_doc_info(#full_doc_info{id=Id,update_seq=Seq,rev_tree=Tree}) -> [{RevId, {IsDeleted, SummaryPointer}, _Path} | Rest] = SortedLeafRevs, {ConflictRevTuples, DeletedConflictRevTuples} = - lists:splitwith(fun({_ConflictRevId, {IsDeleted1, _SummaryPointer}, _}) -> + lists:splitwith(fun({_ConflictRevId, {IsDeleted1, _Sp}, _}) -> not IsDeleted1 end, Rest), ConflictRevs = [RevId1 || {RevId1, _, _} <- ConflictRevTuples], DeletedConflictRevs = [RevId2 || {RevId2, _, _} <- DeletedConflictRevTuples], - #doc_info{ id=Id, update_seq=Seq, |