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

[Greg Stein <gs...@gmail.com>]

On Fri, Apr 23, 2010 at 13:28,  <ph...@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

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

[Philip Martin <ph...@wandisco.com>]

Greg Stein <gs...@gmail.com> writes:

> 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?

I could not see why the code would care whether this was the root of
the copy or not.  Thinking about it a bit more, I probably fixed a
bug:

  svn cp wc/A wc/X
  svn cp -rN wc/X/B wc/Y

In the past this would fail because X/B doesn't have copyfrom.  Now it
copies from the URL of A@N.

-- 
Philip