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

Re: C-Mike's TODO for this week (was "Re: svn mergeinfo broken after merge of mergeinfo-less-copies branch")

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-11-25 14:37:42 CET

On Nov 24, 2007 11:56 PM, C. Michael Pilato <cmpilato@collab.net> wrote:
> Mark Phippard wrote:
> > I am updating a JavaHL test which looks at mergeinfo. It was of
> > course failing because there is no longer mergeinfo from the copy. In
> > the process of updating the test, I noticed a bug in the svn mergeinfo
> > command. Consider this scenario:
> >
> > Standard Greek Tree
> >
> > r2: svn mkdir branches
> > r3 svn cp A branches/A
> > r4: changes and commit from A
> > r5: merge to branches/A and commit
> > r6: more changes and commit on A
> >
> > Now run:
> >
> > $ svn mergeinfo branches/a
> > Path: branches/a
> > Source path: /A
> > Merged ranges: r2:4
> > Eligible ranges: r1:2, r4:6
> >
> > The Eligible ranges should presumably not include r1:2 and just 4:6
>
> 'svn mergeinfo' has not been updated to deal with the mergeinfoless-copies
> changes. I'll be working on that this week [estimate: 8 hours], as well as:
>
> * Turning off mergeinfo calculations during 'svn merge' against pre-1.5
> servers. [estimate: 4 hours]

So will this "take care" of the performance problems with older servers?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 25 14:37:56 2007

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