firemeteor_at_tigris.org writes:
> Author: firemeteor
> Date: Tue Jul 29 07:28:00 2008
> New Revision: 32323
>
> Log:
> On the issue-2843-dev branch.
>
> * subversion/libsvn_client/switch.c
> (svn_client__switch_internal): Handles cropping during switch.
Just to let you know: I reviewed this, looks good.
I also reviewed r32297. Of course, r32297 implies a general review of
"TODO(#2843)" comments later, but r32297 itself looked good.
-Karl
> Modified: branches/issue-2843-dev/subversion/libsvn_client/switch.c
> URL: http://svn.collab.net/viewvc/svn/branches/issue-2843-dev/subversion/libsvn_client/switch.c?pathrev=32323&r1=32322&r2=32323
> ==============================================================================
> --- branches/issue-2843-dev/subversion/libsvn_client/switch.c Tue Jul 29 07:23:49 2008 (r32322)
> +++ branches/issue-2843-dev/subversion/libsvn_client/switch.c Tue Jul 29 07:28:00 2008 (r32323)
> @@ -92,6 +92,11 @@ svn_client__switch_internal(svn_revnum_t
> if (depth == svn_depth_unknown)
> depth_is_sticky = FALSE;
>
> + /* Do not support the situation of both exclude and switch a target. */
> + if (depth_is_sticky && depth == svn_depth_exclude)
> + return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
> + _("Can not both exclude and switch a path"));
> +
> /* Get the external diff3, if any. */
> svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
> SVN_CONFIG_OPTION_DIFF3_CMD, NULL);
> @@ -145,6 +150,15 @@ svn_client__switch_internal(svn_revnum_t
> "is not the same repository as\n"
> "'%s'"), URL, source_root);
>
> + /* We may need to crop the tree if the depth is sticky */
> + if (depth_is_sticky && depth < svn_depth_infinity)
> + {
> + SVN_ERR(svn_wc_crop_tree(adm_access, target, depth,
> + ctx->notify_func2, ctx->notify_baton2,
> + ctx->cancel_func, ctx->cancel_baton,
> + pool));
> + }
> +
> SVN_ERR(svn_ra_reparent(ra_session, URL, pool));
>
> /* Fetch the switch (update) editor. If REVISION is invalid, that's
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-18 00:55:49 CEST