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

Re: svn.collab.net is now running 1.5.0-alpha2

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 29 Feb 2008 13:49:26 -0500

David Glasser wrote:
> On Fri, Feb 29, 2008 at 9:06 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>> I've upgraded svn.collab.net to Subversion 1.5.0-alpha2 (and ViewVC 1.0.5,
>> but that's not terribly relevant).
>>
>> I did *not* run 'svnadmin upgrade' on the repository, so if we did our
>> coding correctly, we still do *not* have merge-tracking enabled for
>> ourselves. There is a reason for this.
>>
>> See, I've got a custom svnsync built on the box that, while copying
>> repository data, also:
>>
>> a) strips wholesale any svn:mergeinfo properties, and
>> b) renames the svnmerge-integrated property to svn:mergeinfo
>
> Do any of our svnmerge-integrated properties have multiple sources? I
> think in svnmerge-integrated, multiple sources are space-separated,
> whereas in svn:mergeinfo, they're newline-separated.

I admit that I took my code from the logic in svnmerge-migrate-history.py,
which appears (to me) to treat the svnmerge-integrated property value is
equivalent to that of svn:mergeinfo.

If there are bugs here, we can fix the code I just committed to svnsync and
I'll gladly re-run the sync jobs.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-02-29 19:50:11 CET

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