You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/06/25 23:48:11 UTC
Re: svn commit: r38204 - trunk/subversion/libsvn_wc
On Thu, Jun 25, 2009 at 23:21, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/deprecated.c Thu Jun 25 14:21:50 2009 (r38204)
>...
> + if (recurse)
> + return svn_error_return(svn_wc_relocate4(wc_ctx, local_abspath, from, to,
> + validator, validator_baton,
> + pool));
> + else
> + {
> + /* This gets sticky. We need to do the above relocation, and then
> + relocate each of the children *back* to the original location. Ugh.
> + */
> + const apr_array_header_t *children;
> + apr_pool_t *iterpool;
> + int i;
> +
> + SVN_ERR(svn_wc_relocate4(wc_ctx, local_abspath, from, to,
> + validator, validator_baton, pool));
How about just doing this call regardless, then for non-recurse do the
child-relocation.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2365535
Re: svn commit: r38204 - trunk/subversion/libsvn_wc
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Jun 25, 2009, at 6:48 PM, Greg Stein wrote:
> On Thu, Jun 25, 2009 at 23:21, Hyrum K.
> Wright<hy...@hyrumwright.org> wrote:
>> ...
>> +++ trunk/subversion/libsvn_wc/deprecated.c Thu Jun 25 14:21:50
>> 2009 (r38204)
>> ...
>> + if (recurse)
>> + return svn_error_return(svn_wc_relocate4(wc_ctx,
>> local_abspath, from, to,
>> + validator,
>> validator_baton,
>> + pool));
>> + else
>> + {
>> + /* This gets sticky. We need to do the above relocation,
>> and then
>> + relocate each of the children *back* to the original
>> location. Ugh.
>> + */
>> + const apr_array_header_t *children;
>> + apr_pool_t *iterpool;
>> + int i;
>> +
>> + SVN_ERR(svn_wc_relocate4(wc_ctx, local_abspath, from, to,
>> + validator, validator_baton, pool));
>
> How about just doing this call regardless, then for non-recurse do the
> child-relocation.
Oh, duh. I'll fix it shortly.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2365585