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

Re: Merging problems RESOLVED!

From: Nick Gilbert <nick_at_x-rm.com>
Date: Tue, 02 Jun 2009 15:56:57 +0100

Hi all,

Just to update you all, I have now resolved the various problems and
error messages I was having with merging.

Solution: I upgraded my Subversion server to 1.6.2 (from 1.5.0) under
Apache 2.2 (from Apache 2.0). Secondly, I ran "svnadmin upgrade
<reponame>" to upgrade the repository format from 1.5 to 1.6. This
seems to have fixed all the merging problems I've been having (for all
types of merge) so it looks like using a newer 1.6 client is unreliable
with a 1.5.x server. Before I upgraded the repo format, normal merging
was working, but I still got error messages when using the "reintegrate
a branch" option (though the error message was now sensible instead of
the bizarre message I was getting before). With the upgraded repo
format, everything seems OK and my merge is now complete :)

I wanted to try VisualSVN Server but unfortunately this doesn't install
on Windows 2000 for some bizarre reason (even thought all the components
it uses work on 2000!) so I upgraded Apache and Subversion manually and
it took quite a while to get everything working.

Thanks for all your input.



To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-02 16:57:19 CEST

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

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