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

Re: [PATCH] v6 Fix #3390 Relative externals not updated during switch

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 30 Dec 2009 14:11:31 +0000

On Wed, Dec 30, 2009 at 07:45:12AM +0100, Daniel Näslund wrote:
> + err = svn_wc__node_get_url(&url, cb->ctx->wc_ctx,
> + abs_parent_dir, cb->pool, cb->pool);
> +
> + /* If we're doing an 'svn export' the current dir will not be a
> + working copy. We can't get the parent_dir. */
> + if (err)
> + {

More nitpicking :-P
Indentation is off below:

> + if (err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
> + {
> + /* Get the URL of the parent directory by appending a portion of
> + parent_dir to from_url. from_url is the URL for to_path and
> + to_path is a substring of parent_dir, so append any characters in
> + parent_dir past strlen(to_path) to from_url (making sure to move
> + past a '/' in parent_dir, otherwise svn_path_url_add_component()
> + will error. */
> + len = strlen(cb->to_path);
> + if (ib.parent_dir[len] == '/')
> + ++len;
> + ib.parent_dir_url = svn_path_url_add_component2(cb->from_url,
> + ib.parent_dir + len,
> + cb->pool);
> + svn_error_clear(err);
> + }
> + else
> + return svn_error_return(err);
> + }
> + else
> + ib.parent_dir_url = url;
> +
> /* We must use a custom version of svn_hash_diff so that the diff
> entries are processed in the order they were originally specified
> in the svn:externals properties. */
Received on 2009-12-30 15:12:15 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.