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

RE: [RFC] QA of manually set svn:mergeinfo

From: Paul Burba <pburba_at_collab.net>
Date: 2007-12-03 21:25:19 CET

> -----Original Message-----
> From: Daniel L. Rall [mailto:dlr@finemaltcoding.com]
> Sent: Tuesday, November 13, 2007 1:02 PM
> To: Paul Burba
> Cc: Mark Phippard; dev@subversion.tigris.org
> Subject: Re: [RFC] QA of manually set svn:mergeinfo
>
> On Thu, 08 Nov 2007, Paul Burba wrote:
>
> > > -----Original Message-----
> > > From: Mark Phippard [mailto:markphip@gmail.com]
> > > Sent: Wednesday, November 07, 2007 11:51 AM
> > > To: Paul Burba
> > > Cc: dev@subversion.tigris.org
> > > Subject: Re: [RFC] QA of manually set svn:mergeinfo
> > >
> > > On 11/7/07, Paul Burba <pburba@collab.net> wrote:
> > > > In the case of improperly ordered ranges I think we can
> safely say
> > > > there is only one correct interpretation ("/trunk:6,3" ==
> > > "/trunk:3,6"
> > > > no matter how much you look at it :-).
> > > >
> > > > With overlapping changes with the same inheritability there is
> > > > only one correct meaning as well ("/trunk:5-6,6-7" ==
> "/trunk:5-7").
> > > >
> > > > *But* in both cases the fact that a user specified
> something odd
> > > > raises a red flag for me that maybe they meant something
> > > else entirely
> > > > or simply don't understand what they are doing. I'm quite
> > > comfortable
> > > > being ultra-strict when someone is using propset to set
> > > svn:mergeinfo.
> > >
> > > That was exactly my point. Your first example above is perfect.
> > > Was the user just sloppy and ordered the value wrong ...
> or is the
> > > ",3"
> > > supposed to be ",13"? There is no way to know. The fact
> that the
> > > format is not right is a clue that something might be wrong, so
> > > maybe we should just fail it.
> >
> > Not entirely sure now that unordered ranges should result
> in an error.
> > The 'Note' in the doc string for svn_mergeinfo_parse() implies that
> > the input string need not have revision ranges in order:
> >
> > /** Parse the mergeinfo from @a input into @a *mergeinfo,
> mapping from
> > * paths to @c apr_array_header_t *'s of @c svn_merge_range_t *
> > * elements. If no mergeinfo is available, return an empty hash
> > * (never @c NULL). Perform temporary allocations in @a pool.
> > *
> > * Note: @a *mergeinfo will contain rangelists that are
> guaranteed to
> > * be sorted (ordered by smallest revision ranges to largest).
> > * @since New in 1.5.
> > */
> > svn_error_t *
> > svn_mergeinfo_parse(apr_hash_t **mergeinfo, const char *input,
> > apr_pool_t *pool);
>
> This code has always required that the rangelists in the
> INPUT text be in sorted order.

Put some validity check for svn ps svn:mergeinfo values in r28213.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 3 21:25:31 2007

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