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

Re: Getting merge tracking in 1.5 working

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 25 Apr 2008 09:08:33 -0400

On Fri, Apr 25, 2008 at 6:03 AM, <david.x.grierson_at_jpmorgan.com> wrote:

> I just downloaded SVN 1.5.0-rc4 to see if it would compile on our systems
> and take a poke around at some of the features in it.
>
> I've noticed some "funnies" to do with the big merge tracking featue.
>
> I performed a merge, committed and then re-attempted the merge (in order
> to check the merge avoidance). When I attempted the second merge it
> attempted to perform the merge again.
>
> According to the manual this is implemented using the svn:mergeinfo
> property to track the changes which have already been applied. When I
> looked for the property upon the directory which had been merged it wasn't
> there.
>
> Now on reading further in the manual I came to the following section:
> http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.pre1.5clients
>
> This states:
> "If you've just upgraded your server to Subversion 1.5 or later, then
> there's a significant risk that pre-1.5 Subversion clients can mess up
> your automated merge tracking."
>
> My intepretation of this is that in order to get merge tracking working
> you need to also run 1.5.0 on the server side.
>
> Is my understanding correct?
>
> Is the assumption that we will all be upgrading our servers as soon as we
> need this functionality - i.e. to get the big 1.5.0 functionality gain you
> need both a 1.5.0 client *and* a 1.5.0 server?

Not only do you need 1.5 on the server, but you also have to upgrade
your repository to the 1.5 format. See this blog post for some
additional details:

http://blogs.open.collab.net/svn/2008/03/subversion-15-b.html

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-25 15:08:57 CEST

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