[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r31493 - branches/issue-2843-dev/subversion/libsvn_wc

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 28 May 2008 11:49:30 -0700

On Wed, May 28, 2008 at 5:28 AM, <firemeteor_at_tigris.org> wrote:
> Author: firemeteor
> Date: Wed May 28 05:28:38 2008
> New Revision: 31493
>
> Log:

You may want to mention in the log that you're on the issue-2843-dev branch.

> Remove the protective check against cropping the wc.

Typically a blank line here.

> * subversion/libsvn_wc/update_editor.c
> (make_editor): remove the protective check.

Typically two spaces at the front of this line.

The patch itself looks fine though! (And good eye fixing up the comment.)

--dave

>
> Modified:
> branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c
>
> Modified: branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c?pathrev=31493&r1=31492&r2=31493
> ==============================================================================
> --- branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c Wed May 28 04:05:54 2008 (r31492)
> +++ branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c Wed May 28 05:28:38 2008 (r31493)
> @@ -3314,12 +3314,8 @@ make_editor(svn_revnum_t *target_revisio
> inner_editor = tree_editor;
> inner_baton = eb;
>
> - /* If our requested depth is sticky, we'll raise an error if asked
> - to make our target more shallow, which is currently unsupported.
> -
> - Otherwise, if our requested depth is *not* sticky, then we need
> - to limit the scope of our operation to the ambient depths present
> - in the working copy already. If a depth was explicitly
> + /* We need to limit the scope of our operation to the ambient depths
> + present in the working copy already. If a depth was explicitly
> requested, libsvn_delta/depth_filter_editor.c will ensure that we
> never see editor calls that extend beyond the scope of the
> requested depth. But even what we do so might extend beyond the
> @@ -3328,27 +3324,14 @@ make_editor(svn_revnum_t *target_revisio
> to do so. (This can also be skipped if the server understands
> consider letting the depth RA capability percolate down to this
> level.) */
> - if (depth_is_sticky)
> - {
> - const svn_wc_entry_t *target_entry;
> - SVN_ERR(svn_wc_entry(&target_entry, svn_path_join(anchor, target, pool),
> - adm_access, FALSE, pool));
> - if (target_entry && (target_entry->depth > depth))
> - return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
> - _("Shallowing of working copy depths is not "
> - "yet supported"));
> - }
> - else
> - {
> - SVN_ERR(svn_wc__ambient_depth_filter_editor(&inner_editor,
> - &inner_baton,
> - inner_editor,
> - inner_baton,
> - anchor,
> - target,
> - adm_access,
> - pool));
> - }
> + SVN_ERR(svn_wc__ambient_depth_filter_editor(&inner_editor,
> + &inner_baton,
> + inner_editor,
> + inner_baton,
> + anchor,
> + target,
> + adm_access,
> + pool));
>
> SVN_ERR(svn_delta_get_cancellation_editor(cancel_func,
> cancel_baton,
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-28 20:49:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.