On Feb 8, 2008 4:10 PM, David Glasser <glasser_at_davidglasser.net> wrote:
>
> 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?
Are you thinking we could end up with "" rather than "/"? If so, I
don't see how that is possible, maybe I'm missing something, but how
can you copy the root of a repository (which is obviously required for
it to be a copy source)?
Regardless, we should probably should check for the leading '/'. Can
svn_client__get_copy_source() return "trunk" rather than "/trunk"?
It's doc string doesn't make any promises about *COPYFROM_PATH's
relative vs. absolute state. I tried to determine any implied
guarantees in the underlying implementation across all RA access
methods but it gets ugly fast. Possibly someone who knows their way
around the inner workings of svn_client_log4() could speak to this...
Paul
---------------------------------------------------------------------
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-09 00:43:25 CET