You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2008/07/16 01:25:13 UTC
svn commit: r677087 - /incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
Author: damien
Date: Tue Jul 15 16:25:12 2008
New Revision: 677087
URL: http://svn.apache.org/viewvc?rev=677087&view=rev
Log:
fix for attachment editing when their are conflicts
Modified:
incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
Modified: incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=677087&r1=677086&r2=677087&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_httpd.erl Tue Jul 15 16:25:12 2008
@@ -653,9 +653,9 @@
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,