From 42258ff550ccc17da58f80dc03313a7268dffaa2 Mon Sep 17 00:00:00 2001 From: "Damien F. Katz" Date: Tue, 15 Jul 2008 23:25:12 +0000 Subject: fix for attachment editing when their are conflicts git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@677087 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_httpd.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index 27d2d902..af8d9b46 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -653,9 +653,9 @@ handle_attachment_request(Req, Method, _DbName, Db, DocId, FileName) missing_rev -> % make the new doc #doc{id=DocId}; _ -> - case couch_db:open_doc(Db, DocId, []) of - {ok, Doc0} -> Doc0#doc{revs=[Rev]}; - Error -> throw(Error) + case couch_db:open_doc_revs(Db, DocId, [Rev], []) of + {ok, [{ok, Doc0}]} -> Doc0#doc{revs=[Rev]}; + {ok, [Error]} -> throw(Error) end end, -- cgit v1.2.3