> -----Original Message-----
> From: Paul Burba [mailto:pburba@collab.net]
> Sent: Friday, September 28, 2007 11:34 AM
> To: dev@subversion.tigris.org; kameshj@tigris.org
> Subject: Re: svn commit: r26803 - in trunk/subversion:
> libsvn_client tests/cmdline
>
> > -----Original Message-----
> > From: kameshj@tigris.org [mailto:kameshj@tigris.org]
> > Sent: Thursday, September 27, 2007 10:25 AM
> > To: svn@subversion.tigris.org
> > Subject: svn commit: r26803 - in trunk/subversion:
> > libsvn_client tests/cmdline
> >
> > Author: kameshj
> > Date: Thu Sep 27 07:25:29 2007
> > New Revision: 26803
> >
> > Log:
> > Fix issue 2821.
>
> <snip>
>
> > Modified: trunk/subversion/libsvn_client/merge.c
> > URL:
> > http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_clien
> > t/merge.c?pathrev=26803&r1=26802&r2=26803
> > ==============================================================
> > ================
> > --- trunk/subversion/libsvn_client/merge.c (original)
> > +++ trunk/subversion/libsvn_client/merge.c Thu Sep 27 07:25:29 2007
>
> <snip>
>
> > +slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo,
> > + svn_revnum_t end_rev, apr_pool_t *pool) {
> > + int i;
> > + for (i = 0; i < children_with_mergeinfo->nelts; i++)
> > + {
> > + svn_client__merge_path_t *child =
> > +
> > APR_ARRAY_IDX(children_with_mergeinfo, i,
> > +
> > svn_client__merge_path_t *);
> > + if (!child || child->absent)
> > + continue;
> > + if (child->remaining_ranges->nelts > 0)
> > + {
> > + svn_merge_range_t *range =
> > APR_ARRAY_IDX(children_with_mergeinfo, 0,
> > +
> > svn_merge_range_t *);
>
> Hi Kamesh,
>
> Spotted this while working on issue 2818:
>
> children_with_mergeinfo is populated with
> svn_client__merge_path_t* not svn_client__merge_path_t *. I
> assume you meant something like:
>
> svn_merge_range_t *range =
> APR_ARRAY_IDX(child->remaining_ranges, 0, svn_merge_range_t *); ?
>
> Regardless, slice_remaining_ranges() is definitely not doing
> what you want. Interestingly, the test suite passes* with it
> completely removed!
> You probably want to take a look.
>
> * excepting "merge_tests.py 63: merge fails if subtree is
> deleted on src", which has been failing since r26803.
Kamesh,
Hadn't realized that this is failing only on Win32, I'll check it out as
soon as 2818 is wrapped if no one gets to it first.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 28 18:46:07 2007