How do you merge a feature branch in a Codeplex project?

Question

I have a project on Codeplex and I use TortoiseSVN to access the source code. I've created a feature branch and now I need to merge changes from the trunk into the feature branch. I'll need to eventually merge the feature branch back into the trunk as well. But it seems that SvnBridge doesn't support merging!

Does anyone have suggestions on how to accomplish a merge on Codeplex? Use Team Explorer for the merge? Or TF.exe or the Codeplex client?

Answer 1

As you already have TortoiseSVN, you could simply use it alone to perform the merge. Unless you end up with a lot of conflicts, a merge can easily be performed outside of any IDE.

Answer 2

You can use TortoiseSVN to simply merge you trunk to your branch and then back to the trunk. It can be done easily.

Check out a working copy of your branch, then right-click on the folder and then choose TortoiseSVN -> Merge...

Choose the first option and then choose the trunk. follow the directions on screen and test your merge before to see the results.

Same for the second merge back to the trunk.

Answer 3

Since Codeplex now supports native mercurial, I think I'm going to try that. I've been wanting try out a DVCS anyhow.