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

Re: Bug in svn merge --show-revs eligible ^/subversion/trunk ^/subversion/branches/1.6.x

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 26 Feb 2010 13:07:43 -0500

On Thu, Feb 25, 2010 at 6:13 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Thu, Feb 25, 2010 at 03:52:25PM -0500, Paul Burba wrote:
>> Stefan, do you recall, or can you make an educated guess as to what
>> client version you used to make the 1.6.x-r40452 branch in r880530?
>
> Must have been a trunk build from around that timeframe.
>
>> Did you remember how you made the branch?  URL-to-URL copy I'm
>> assuming?
>
> I've always been doing URL-to-URL copies to create branches, yes.
>
> Stefan

When comparing mergeinfo for '/subversion/trunk' between
^/subversion/branches/1.6.x_at_880529 and
^/subversion/branches/1.6.x-r40452_at_880530 it's interesting to note
that there are exactly the same number of revisions (273) even though
they *all* differ. The ranges on the 1.6.x-r40452 branch were from
3655 to 3910 revisions higher than those on 1.6.x. It's probably not
a coincidence that 3644 is the number of revisions in the old CVS
repository that hosted Subversion development prior to the project
becoming self-hosting. Mike converted this history with cvs2svn and
combined it with our s.t.o. history and the whole thing got loaded to
s.a.o -- see http://svn.apache.org/repos/asf/subversion/README. This
in turn is likely related to the busted mergeinfo offsets we found
during 1.6.7 testing,
http://svn.haxx.se/dev/archive-2009-12/0386.shtml (which is still an
open item for me).

I still can't replicate anything like this, but I'm syncing a mirror
of s.a.o. right now and will use it to more exactly replicate what
Stefan did...

Paul
Received on 2010-02-26 19:08:18 CET

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