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

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

From: David Glasser <glasser_at_davidglasser.net>
Date: Fri, 8 Feb 2008 13:10:07 -0800

On Feb 8, 2008 12:51 PM, <pburba_at_tigris.org> wrote:
> Author: pburba
> Date: Fri Feb 8 12:51:36 2008
> New Revision: 29239
>
> Log:
> Follow-up to r29216, fix for issue #3094.
>
> * subversion/libsvn_client/merge.c
> (normalize_merge_sources): If we add any svn_location_segment_t's to the
> array initially populated by svn_client__repos_location_segments(), be sure
> the path members don't have leading '/'.
>
>
>
> Modified:
> trunk/subversion/libsvn_client/merge.c
>
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=29239&r1=29238&r2=29239
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c (original)
> +++ trunk/subversion/libsvn_client/merge.c Fri Feb 8 12:51:36 2008
> @@ -3814,7 +3814,8 @@
> {
> svn_location_segment_t *new_segment =
> apr_pcalloc(pool, sizeof(*new_segment));
> - new_segment->path = copyfrom_path;
> + /* Skip the leading '/'. */
> + new_segment->path = copyfrom_path + 1;
> new_segment->range_start = copyfrom_rev;
> new_segment->range_end = copyfrom_rev;
> segment->range_start = copyfrom_rev + 1;

It's not possible for copyfrom_path to be "", right?

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-08 22:10:21 CET

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