Merging branches?

Apr 27, 2009 at 9:44 PM
How do people merge branches for projects hosted at CodePlex? I've been using TortoiseSVN for source control and it seemed to work fine until I tried to merge a branch. I got this error:

Error: Retrieval of mergeinfo unsupported by ''

Well, okay, apparently the SVN bridge doesn't know how to do the new merge type. I install Visual Studio Team Explorer and I can successfully merge changes there. However when I do so, the merge simply does not show up in my TortoiseSVN enlistment, no matter how many times I try to "get latest". I can only get the changes to show up if I do a fresh checkout.

I considered just switching to Team Explorer for source control, but when I don't use source control binding, picking out files to add becomes unbearable, and when I do use source control binding it messes up people who download the source of my project.

Does anyone have a setup that allows them to branch/merge without driving them crazy?