couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r677087 - /incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
Date Tue, 15 Jul 2008 23:25:13 GMT
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,
     



Mime
View raw message