subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1400560 - in /subversion/branches/ev2-export/subversion/libsvn_client: add.c commit.c copy.c delete.c prop_commands.c
Date Sun, 21 Oct 2012 02:37:53 GMT
Author: hwright
Date: Sun Oct 21 02:37:53 2012
New Revision: 1400560

URL: http://svn.apache.org/viewvc?rev=1400560&view=rev
Log:
On the ev2-export branch: Fix build breakage introduced in the merge from
trunk in r1400559.

* subversion/libsvn_client/delete.c
  (single_repos_delete),
* subversion/libsvn_client/prop_commands.c
  (propset_on_url,
* subversion/libsvn_client/copy.c
  (repos_to_repos_copy, wc_to_repos_copy),
* subversion/libsvn_client/add.c
  (mkdir_urls),
* subversion/libsvn_client/commit.c
  (get_ra_editor, svn_client_import5): Don't pass a cancellation callback/baton
    when getting an Ev2 commit editor from the RA layer.

Modified:
    subversion/branches/ev2-export/subversion/libsvn_client/add.c
    subversion/branches/ev2-export/subversion/libsvn_client/commit.c
    subversion/branches/ev2-export/subversion/libsvn_client/copy.c
    subversion/branches/ev2-export/subversion/libsvn_client/delete.c
    subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c

Modified: subversion/branches/ev2-export/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/add.c?rev=1400560&r1=1400559&r2=1400560&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/add.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/add.c Sun Oct 21 02:37:53 2012
@@ -997,7 +997,6 @@ mkdir_urls(const apr_array_header_t *url
                                  commit_baton,
                                  NULL, TRUE, /* No lock tokens */
                                  NULL, NULL, NULL, NULL,
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   return svn_error_trace(drive_editor(editor, targets, children_hash,

Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit.c?rev=1400560&r1=1400559&r2=1400560&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit.c Sun Oct 21 02:37:53 2012
@@ -677,7 +677,6 @@ get_ra_editor(svn_editor_t **editor,
                                  svn_client__ra_make_cb_baton(ctx->wc_ctx,
                                                               relpath_map,
                                                               pool),
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   return SVN_NO_ERROR;
@@ -819,7 +818,6 @@ svn_client_import5(const char *path,
                                  commit_revprops, commit_callback,
                                  commit_baton, NULL, TRUE,
                                  NULL, NULL, NULL, NULL,
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  scratch_pool, scratch_pool));
 
   /* Do the import. */

Modified: subversion/branches/ev2-export/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/copy.c?rev=1400560&r1=1400559&r2=1400560&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/copy.c Sun Oct 21 02:37:53 2012
@@ -1047,7 +1047,6 @@ repos_to_repos_copy(const apr_array_head
                                  fetch_props_func,
                                  fetch_kind_func,
                                  path_infos,
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   return svn_error_trace(drive_editor(editor, new_dirs, path_infos, is_move,
@@ -1371,7 +1370,6 @@ wc_to_repos_copy(const apr_array_header_
                                  svn_client__ra_make_cb_baton(ctx->wc_ctx,
                                                               relpath_map,
                                                               pool),
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   /* Perform the commit. */

Modified: subversion/branches/ev2-export/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/delete.c?rev=1400560&r1=1400559&r2=1400560&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/delete.c Sun Oct 21 02:37:53 2012
@@ -188,7 +188,6 @@ single_repos_delete(svn_ra_session_t *ra
                                  commit_baton,
                                  NULL, TRUE, /* No lock tokens */
                                  NULL, NULL, NULL, NULL,
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   for (i = 0; i < relpaths->nelts; i++)

Modified: subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c?rev=1400560&r1=1400559&r2=1400560&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c Sun Oct 21 02:37:53
2012
@@ -228,7 +228,6 @@ propset_on_url(const char *propname,
                                  commit_baton,
                                  NULL, TRUE, /* No lock tokens */
                                  NULL, NULL, NULL, NULL,
-                                 ctx->cancel_func, ctx->cancel_baton,
                                  pool, pool));
 
   /* ### Need to handle symlink? */



Mime
View raw message