[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: Jonatan Soto <seniledementia_at_gmail.com>
Date: Wed, 27 Apr 2011 09:20:26 +0200

Hi Mike,

Sorry if we were mistaken, but when the merge finishes (following Ryan's
indications) it says:

Summary of conflicts:
  Text conflicts: 15
  Tree conflicts: 8

Perhaps the problem is that we are using the latest subclipse plugin as a
client and if we are not wrong it is based on 1.6 client. We've downloaded a
1.4 client but when we use it, says that the version is not correct. We
assume that it is caused because the working copy was previously checked out
using subclipse.
The subversion server is 1.3 for sure, it is shown at the bottom of the page
when we are browsing it through a web browser.

On the other hand, I totally agree with you, we should upgrade the svn
server version but we are working for a big company and as you can figure it
out, the infra team would not be agree with us if we tell them to upgrade.
Many projects are under this repository and it won't be easier to tell them
that (lot's of bureaucracy).

Anyway, thanks a lot for your support!

On Tue, Apr 26, 2011 at 7:26 PM, Mike Dixon <
michael.dixon_at_denovosoftware.com> wrote:

> 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.)
> -Mike

Jonatan Soto
Received on 2011-04-27 09:21:09 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.