svn commit: r1150261 - /subversion/trunk/subversion/libsvn_repos/commit.c

[rh...@apache.org]

Author: rhuijben
Date: Sun Jul 24 02:56:18 2011
New Revision: 1150261

URL: http://svn.apache.org/viewvc?rev=1150261&view=rev
Log:
* subversion/libsvn_repos/commit.c
  (close_edit): Don't drop transaction abort errors when we can just add them
    to the existing error chain.

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

Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1150261&r1=1150260&r2=1150261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Sun Jul 24 02:56:18 2011
@@ -718,12 +718,11 @@ close_edit(void *edit_baton,
          So, in a nutshell: svn commits are an all-or-nothing deal.
          Each commit creates a new fs txn which either succeeds or is
          aborted completely.  No second chances;  the user simply
-         needs to update and commit again  :)
+         needs to update and commit again  :) */
 
-         We ignore the possible error result from svn_fs_abort_txn();
-         it's more important to return the original error. */
-      svn_error_clear(svn_fs_abort_txn(eb->txn, pool));
-      return svn_error_trace(err);
+      return svn_error_trace(
+                svn_error_compose_create(err,
+                                         svn_fs_abort_txn(eb->txn, pool)));
     }
 
   /* Pass new revision information to the caller's callback. */