I just cut a new SVN branch of my code. Of course that was followed by some changes that need to be applied to both the new branch and trunk. I made the changes on the new branch, and tried to merge to trunk using the right-click "compare with branch..." option but it didn't work. I get the dialog asking me to compare with trunk, branches, or tags and I click branches. I see my branches. I click the new branch that I want to merge code from. Soon thereafter I get an error saying "svn: URL 'svn+ssh://...../branches/2.0' refers to a directory."
I tried to use the "configure branches" option but that doesn't let me make changes (The "OK" button is always disabled). Is there something I should change to make this work or is this a bug?
I am able to integrate from the new branch to trunk, but I prefer to compare changes and bring them in manually.