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

Re: svn commit: r33704 - trunk/subversion/libsvn_client

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 17 Oct 2008 11:37:41 -0700

On Thu, Oct 16, 2008 at 10:54 AM, <pburba_at_tigris.org> wrote:
>...
> * subversion/libsvn_client/merge.c
> (filter_self_referential_mergeinfo): Don't try to filter self-referential
> mergeinfo on paths that are scheduled for replacement.

Another (recent) case where the log message has more information than
what can be found in the code(!)

>...
> +++ trunk/subversion/libsvn_client/merge.c Thu Oct 16 10:54:33 2008 (r33704)
> @@ -557,7 +557,8 @@ filter_self_referential_mergeinfo(apr_ar
> /* If PATH itself is newly added there is no need to filter. */

This comment is wrong, given the change below.

> SVN_ERR(svn_wc__entry_versioned(&target_entry, path, adm_access,
> FALSE, pool));
> - if (target_entry->schedule == svn_wc_schedule_add)
> + if (target_entry->schedule == svn_wc_schedule_add
> + || target_entry->schedule == svn_wc_schedule_replace)
> return SVN_NO_ERROR;
>
> adjusted_props = apr_array_make(pool, (*props)->nelts, sizeof(svn_prop_t));

Cheers,
-g

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-17 20:37:56 CEST

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