[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: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 01 Feb 2008 00:08:46 -0500

"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. --

Hmmm.

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?

(This is not the first time this has been discussed, I'm sure.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-01 09:08:58 CET

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