You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/19 14:17:37 UTC

svn commit: r1302417 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

Author: danielsh
Date: Mon Mar 19 13:17:36 2012
New Revision: 1302417

URL: http://svn.apache.org/viewvc?rev=1302417&view=rev
Log:
Eliminate another ra_serf assertion.

* subversion/libsvn_ra_serf/commit.c
  (close_edit): Return an svn_error_t on MERGE errors.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/commit.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1302417&r1=1302416&r2=1302417&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Mon Mar 19 13:17:36 2012
@@ -2217,7 +2217,10 @@ close_edit(void *edit_baton,
 
   if (svn_ra_serf__merge_get_status(merge_ctx) != 200)
     {
-      SVN_ERR_MALFUNCTION();
+      return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+                               _("MERGE request failed: returned %d "
+                                 "(during commit)"),
+                               svn_ra_serf__merge_get_status(merge_ctx));
     }
 
   /* Inform the WC that we did a commit.  */