svn commit: r1150266 - /subversion/trunk/subversion/libsvn_client/commit.c

[rh...@apache.org]

Author: rhuijben
Date: Sun Jul 24 03:09:13 2011
New Revision: 1150266

URL: http://svn.apache.org/viewvc?rev=1150266&view=rev
Log:
* subversion/libsvn_client/commit.c
  (svn_client_commit5): Instead of ignoring transaction abort errors,
    compose them in the error chain.

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

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1150266&r1=1150265&r2=1150266&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Sun Jul 24 03:09:13 2011
@@ -1452,7 +1452,8 @@ svn_client_commit5(const apr_array_heade
  cleanup:
   /* Abort the commit if it is still in progress. */
   if (commit_in_progress)
-    svn_error_clear(editor->abort_edit(edit_baton, pool));
+    cmt_err = svn_error_compose_create(cmt_err,
+                                       editor->abort_edit(edit_baton, pool));
 
   /* A bump error is likely to occur while running a working copy log file,
      explicitly unlocking and removing temporary files would be wrong in