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

Re: [PATCH] Fix for issue 3620 - resolve command

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 3 Nov 2010 19:14:36 +0100

Thanks very much for the patch. Committed in r1030580.

I made one tweak:

On Wed, Nov 03, 2010 at 09:35:13PM +0530, Noorul Islam K M wrote:
> Index: subversion/svn/resolve-cmd.c
> ===================================================================
> --- subversion/svn/resolve-cmd.c (revision 1030477)
> +++ subversion/svn/resolve-cmd.c (working copy)

> @@ -93,13 +94,26 @@
[...]
> for (i = 0; i < targets->nelts; i++)
> {
> const char *target = APR_ARRAY_IDX(targets, i, const char *);
> svn_pool_clear(iterpool);
> SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
> - err = svn_client_resolve(target,
> + err = svn_client_resolve(svn_dirent_canonicalize(target, iterpool),

It's not necessary to canonicalise target here because that's already
done by svn_cl__args_to_target_array_print_reserved(). So I've removed
the above bit before committing.

Thanks,
Stefan
Received on 2010-11-03 19:15:29 CET

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