[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: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: Thu, 31 Jan 2008 20:51:00 -0800

On Jan 31, 2008 8:45 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "David Glasser" <glasser_at_davidglasser.net> writes:
> > Should we use svnmerge.py or something until the server is running an RC?
>
> Excellent idea. Yes; because that way when we upgrade, we'll also be
> testing our conversion script.

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

---------------------------------------------------------------------
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:59 CET

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