subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1409717 - /subversion/trunk/subversion/libsvn_client/commit.c
Date Thu, 15 Nov 2012 10:13:23 GMT
Author: rhuijben
Date: Thu Nov 15 10:13:22 2012
New Revision: 1409717

URL: http://svn.apache.org/viewvc?rev=1409717&view=rev
Log:
* subversion/libsvn_client/commit.c
  (svn_client_import5): Compose abort error instead of directly clearing it.

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=1409717&r1=1409716&r2=1409717&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Thu Nov 15 10:13:22 2012
@@ -1058,8 +1058,9 @@ svn_client_import5(const char *path,
                     ignore_unknown_node_types, filter_callback,
                     filter_baton, ctx, iterpool)))
     {
-      svn_error_clear(editor->abort_edit(edit_baton, iterpool));
-      return svn_error_trace(err);
+      return svn_error_compose_create(
+                    err,
+                    editor->abort_edit(edit_baton, iterpool));
     }
 
   svn_pool_destroy(iterpool);



Mime
View raw message