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

Re: Problems merging two branches - Subversion 1.3

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Tue, 26 Apr 2011 10:26:10 -0700

On 4/26/2011 9:47 AM, Jonatan Soto wrote:
> Subversion 1.3
> tree conflicts.

Wait, what? Tree conflicts weren't introduced until svn 1.6. Something
strange is going on here if you think you're using 1.3 but you're
getting reports of tree conflicts.

(And yes, as you suspected the real solution is probably to upgrade to
at least 1.5, and 1.6 is pretty stable at this point too. With such an
old version, you're going to have a hard time finding anyone with much
insight into your problem.)

Received on 2011-04-26 19:26:42 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.