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

Re: Merge no longer working after 1.5 upgrade

From: Mark K <mark_at_mitsein.net>
Date: Tue, 15 Jul 2008 16:27:56 -0500

On Tue, 15 Jul 2008 14:47:36 -0500
"Ryan Sakry" <rsakry_at_rite.us> wrote:

> So I have been using TortoiseSVN client with Visual Studio and
> VisualSVN and SVN running on a Gentoo Linux box for over 6 months
> now, and I gotta say I love it. About a week ago I upgraded to
> TortoiseSVN 1.5 client and love the new version. My only problem is
> that I was trying to merge a branch I created prior to updating and
> kept getting an error about the server not supporting mergeinfo.
> This I understand because I have done a fair bit of homework and knew
> that the SVN developers were working on integration merge tracking.
> A quick check of the subversion homepage let me know that for this to
> work I needed 1.5 of the server and an upgraded repository. Again no
> biggy. I unmasked subversion 1.5 in Gentoo (they have not officially
> released it to the Gentoo portage tree yet), and installed.
> Everything was great, no issues crept up during compile or install.
> I can browse my repository just fine, check out code, no issues.
How (and perhaps why) are you runnning TortoiseSVN and Visual Studio on

> The reason I am posting is that when I try to merge, specifically
> "Reintegrate a branch", no matter the project I am working on, when I
> perform a Test merge or the real thing I get the following error:
> Command: Reintegrate merge https://svn.rite.local/repos/Internal
> Applications/RITE Developer SDK/3.0/Branch/1 into C:\Documents and
> Settings\rsakry\My Documents\Visual Studio 2005\Projects\Internal
> Projects\SDK Temp
> Error: Malformed URL for repository
> Finished!:
> Now I have Googled this to exhaustion, and found some similar errors,
> but not a resolution to this issue. I figured perhaps this is why
> Gentoo still had the new version marked as masked so I uninstalled it
> and downloaded the source code and compiled myself. Again I am able
> to browse, check out, etc, but again I cannot merge. Same problems.
> Anyone have any thoughts? Anything I can try, any more information I
> can get to help come up with a solution? Or do I just have to wait
> for 1.5.1 which apparently is coming out sometime in the next week or
> two?
> Your help is certainly appreciated.
I do know that the subversion ebuild for 1.5.0 has an issue:
http://bugs.gentoo.org/show_bug.cgi?id=229045 but I don't know if that
is related to your issue at all. I integrated the submitted patch
there into a local overlay and installed 1.5.0 on my box. I haven't
done a lot of testing with it yet, but I was able to do successful
reintegrattion merges over svn+ssh.

Can you do the same merge using the svn command line client? I would
give that a shot to try to narrow down where the issue lies. I assume
after upgrading to svn 1.5.0 on the server, an svnadmin upgrade was run
on the repository?

Mark K
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-15 23:28:29 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.