After upgrading to Subversion 1.5 I’ve recently had problems merging between our trunk and another branch.
Firstly, I found I couldn’t do so from the root of the trunk/branch.
So the following would fail:
http://rob.repo.com/trunk -> http://rob.repo.com/branch
I would receive - “Error - Malformed URL of repository”. This was using subversion (via command line) and TortoiseSVN.
However, for some insane reason, it would work for some of the sub folders (but not all of them), ie
http://rob.repo.com/trunk/src -> http://rob.repo.com/branch/src
This didn’t seem right as the trunk and branch are just folders within the subversion repository so merging between them shouldn’t be a problem.
Anyway after hacking around for hours, I found that if you put an @ symbol in the URI it works without any problem, ie:
http://@rob.repo.com/trunk
This worked using version 1.5.0, Build 13316 of Tortoise SVN. I’ve yet to try it via the command line.
UPDATE 14/11/2008:
I thought I’d just add, when checking out a repository, it’s probably worth including the @ symbol in the url (as per above). That way, when doing “reverts” with TortoiseSVN you won’t run into the same problem. I only mention as this happened to one of the guys at work.
3 Comments
Superb solution, thanks - now all I have to figure out is why it worked this morning and not this afternoon, when nothing has changed!!!
Which versions of Subversion are you using? 1.5?
It’s been ok for us so we’ve not upgraded Subversion yet. It shouldn’t matter what version of TortoiseSVN you use, as I tried all the above via command line.
We’re using SVN 1.5*
It seemed to be a svn thing, nothing to do with TortoiseSVN - as you say the command line does the same thing.
I’e lots of merging to do next week, so I’ll see what happens.
Pete