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

Re: merge tracking on the 1.5 branch

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 01 Feb 2008 11:49:33 -0500

Karl Fogel wrote:
> "Justin Erenkrantz" <justin_at_erenkrantz.com> writes:
>> If you use svnmerge.py with a trunk/1.5 client, I find that it still
>> sets svn:mergeinfo properties against older servers. So, the
>> conversion scripts will be a little wonky as you'll need to prune the
>> 1.5-set merge properties that are invalid. Thinking about it, this
>> probably shouldn't happen due to capability negotiation, but I know it
>> *does* with current trunk against 1.4.x servers. Fair warning. --

When I upgrade svn.collab.net to 1.5.0-beta or whatever, I'll be stripping
pre-existing svn:mergeinfo from our dataset using a customized svnsync binary.

> I'm actually not sure what the right 1.5 client behavior against a 1.4
> server should be. Should it set svn:mergeinfo properties? Always?
> Only in certain circumstances?

IMO, a 1.5 client should never set svn:mergeinfo when talking to a 1.4
repository (note that I said "repository", not server). To accomplish this,
we need to grow FS-level capabilities reporting and integrate that into our
RA capabilities checks.

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

Received on 2008-02-01 17:49:47 CET

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