C. Michael Pilato wrote:
> Author: cmpilato
> Date: Thu Jan 29 11:52:02 2009
> New Revision: 35554
>
> Log:
> Finish issue #3365 - Support --ignore-externals option for "svn copy".
>
> * subversion/include/svn_client.h
> (svn_client_copy5): New function.
> (svn_client_copy4): Deprecate, and rework docstring to describe
> delta against previous version.
>
> * subversion/libsvn_client/deprecated.c
> (svn_client_copy4): Move here, and now just wrap svn_client_copy5().
> (svn_client_copy3): Update this to be a wrapper around svn_client_copy5().
>
> * subversion/libsvn_client/copy.c
> (repos_to_wc_copy_single): Add 'ignore_externals' parameter, passed
> to svn_client__checkout_internal().
> (repos_to_wc_copy): Add 'ignore_externals' parameter, passed to
> repos_to_wc_copy_single().
> (try_copy): Add 'ignore_externals' parameter, passed to repos_to_wc_copy().
> (svn_client_copy5): New. Like svn_client_copy4, but accepts
> 'ignore_externals' parameter, which is passed to try_copy().
>
> * subversion/svn/main.c
> (svn_cl__cmd_table): Add support for --ignore-externals to "copy".
>
> * subversion/svn/copy-cmd.c
> (svn_cl__copy): Now call svn_client_copy5() instead of svn_client_copy4().
>
> Modified:
> trunk/subversion/include/svn_client.h
> trunk/subversion/libsvn_client/copy.c
> trunk/subversion/libsvn_client/deprecated.c
> trunk/subversion/svn/copy-cmd.c
> trunk/subversion/svn/main.c
...
> Modified: trunk/subversion/svn/copy-cmd.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/copy-cmd.c?pathrev=35554&r1=35553&r2=35554
> ==============================================================================
> --- trunk/subversion/svn/copy-cmd.c Thu Jan 29 11:02:42 2009 (r35553)
> +++ trunk/subversion/svn/copy-cmd.c Thu Jan 29 11:52:02 2009 (r35554)
> @@ -131,9 +131,9 @@ svn_cl__copy(apr_getopt_t *os,
> SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton3), opt_state,
> NULL, ctx->config, pool));
>
> - err = svn_client_copy4(&commit_info, sources, dst_path, TRUE,
> - opt_state->parents, opt_state->revprop_table,
> - ctx, pool);
> + err = svn_client_copy5(&commit_info, sources, dst_path, TRUE,
> + opt_state->parents, opt_state->ignore_externals,
> + opt_state->revprop_table, ctx, pool);
Doesn't this change the behavior or svn_client_copy3()?
> if (ctx->log_msg_func3)
> SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
>
> Modified: trunk/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=35554&r1=35553&r2=35554
> ==============================================================================
> --- trunk/subversion/svn/main.c Thu Jan 29 11:02:42 2009 (r35553)
> +++ trunk/subversion/svn/main.c Thu Jan 29 11:52:02 2009 (r35554)
> @@ -421,7 +421,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> "contact the repository. As such, they may not, by default, be able\n"
> "to propagate merge tracking information from the source of the copy\n"
> "to the destination.\n"),
> - {'r', 'q', opt_parents, SVN_CL__LOG_MSG_OPTIONS} },
> + {'r', 'q', opt_ignore_externals, opt_parents, SVN_CL__LOG_MSG_OPTIONS} },
>
> { "delete", svn_cl__delete, {"del", "remove", "rm"}, N_
> ("Remove files and directories from version control.\n"
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1069971
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1069988
Received on 2009-01-29 20:55:55 CET