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 2012/11/15 11:10:17 UTC

svn commit: r1409716 - /subversion/trunk/subversion/libsvn_client/add.c

Author: rhuijben
Date: Thu Nov 15 10:10:17 2012
New Revision: 1409716

URL: http://svn.apache.org/viewvc?rev=1409716&view=rev
Log:
* subversion/libsvn_client/add.c
  (mkdir_urls): Compose errors instead of clearing some.

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

Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=1409716&r1=1409715&r2=1409716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Thu Nov 15 10:10:17 2012
@@ -1384,11 +1384,13 @@ mkdir_urls(const apr_array_header_t *url
   /* Call the path-based editor driver. */
   err = svn_delta_path_driver2(editor, edit_baton, targets, TRUE,
                                path_driver_cb_func, (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_trace(err);
+      return svn_error_compose_create(
+                err,
+                editor->abort_edit(edit_baton, pool));
     }
 
   /* Close the edit. */