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

Re: svn commit: r937421 - /subversion/trunk/subversion/libsvn_client/copy.c

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 23 Apr 2010 13:47:47 -0400

On Fri, Apr 23, 2010 at 13:28, <philip_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/copy.c Fri Apr 23 17:28:02 2010
> @@ -2037,33 +2037,37 @@ try_copy(svn_commit_info_t **commit_info
>
>               for (i = 0; i < copy_pairs->nelts; i++)
>                 {
> -                  const char *url;
> +                  const char *src_abspath, *copyfrom_url, *url;
> +                  svn_revnum_t base_rev, copyfrom_rev;
>                   svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
>                                                     svn_client__copy_pair_t *);
>
> -                  /* We can convert the working copy path to a URL based on the
> -                     entries file. */
> -                  const svn_wc_entry_t *entry;
> -                  const char *src_abspath;
> -
>                   svn_pool_clear(iterpool);
>
>                   SVN_ERR(svn_dirent_get_absolute(&src_abspath, pair->src,
>                                                   iterpool));
> -                  SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx,
> -                                                      src_abspath,
> -                                                      svn_node_unknown,
> -                                                      FALSE, FALSE,
> -                                                      iterpool, iterpool));
> -
> -                  url = (entry->copied ? entry->copyfrom_url : entry->url);
> +                  SVN_ERR(svn_wc__node_get_copyfrom_info(&copyfrom_url,
> +                                                         &copyfrom_rev,

Is this conversion still going to work, noting the earlier discussion
about children having entry->copyfrom_url == NULL, yet the node
function returns non-NULL for all copied children?

>...

Cheers,
-g
Received on 2010-04-23 19:48:15 CEST

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.