svn commit: r1581816 - /subversion/trunk/subversion/libsvn_ra_svn/editorp.c

[rhuijben]

Author: rhuijben
Date: Wed Mar 26 13:00:13 2014
New Revision: 1581816

URL: http://svn.apache.org/r1581816
Log:
* subversion/libsvn_ra_svn/editorp.c
  (ra_svn_close_edit): Make errors easier to diagnose by composing errors
    instead of just clearing one.

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/editorp.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1581816&r1=1581815&r2=1581816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Mar 26 13:00:13 2014
@@ -395,11 +395,13 @@ static svn_error_t *ra_svn_close_edit(vo
   SVN_ERR_ASSERT(!eb->got_status);
   eb->got_status = TRUE;
   SVN_ERR(svn_ra_svn__write_cmd_close_edit(eb->conn, pool));
-  err = svn_ra_svn__read_cmd_response(eb->conn, pool, "");
+  err = svn_error_trace(svn_ra_svn__read_cmd_response(eb->conn, pool, ""));
   if (err)
     {
-      svn_error_clear(svn_ra_svn__write_cmd_abort_edit(eb->conn, pool));
-      return err;
+      return svn_error_compose_create(
+                    err,
+                    svn_error_trace(
+                        svn_ra_svn__write_cmd_abort_edit(eb->conn, pool)));
     }
   if (eb->callback)
     SVN_ERR(eb->callback(eb->callback_baton));