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

Posted to commits@subversion.apache.org by rh...@apache.org on 2011/05/02 20:52:43 UTC

svn commit: r1098729 - /subversion/trunk/subversion/libsvn_client/delete.c

Author: rhuijben
Date: Mon May  2 18:52:43 2011
New Revision: 1098729

URL: http://svn.apache.org/viewvc?rev=1098729&view=rev
Log:
* subversion/libsvn_client/delete.c
  (delete_urls): Combine two errors instead of dropping one.

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

Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1098729&r1=1098728&r2=1098729&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Mon May  2 18:52:43 2011
@@ -248,9 +248,9 @@ delete_urls(const apr_array_header_t *pa
                               (void *)editor, pool);
   if (err)
     {
-      /* At least try to abort the edit (and fs txn) before throwing err. */
-      svn_error_clear(editor->abort_edit(edit_baton, pool));
-      return svn_error_return(err);
+      return svn_error_return(
+               svn_error_compose_create(err,
+                                        editor->abort_edit(edit_baton, pool)));
     }
 
   /* Close the edit. */