How are you supposed to do this simple SVN task in Intellij (read docs)? merging branch to trunk

I've been reading the SVN help files and going over the options within IDEA (12.0.3) and I'm wondering how to easily do a merge of a branch into trunk?

Basically I want to do this, that I can do easily from the command line:

svn merge -r10703:10816 http://myusername@oursvnserver/svn/repos/Applications/myApp/branches/VERSION-1.1

I tried VCS options while on trunk "merge from" but I ended up with a warning that I was going to corrupt my branch so that I could no longer commit to it. That's no good.

Then I played about with various options on "integrate directories" but it's extremely confusing. Shouldn't you label what source 1  and source 2 is? Maybe call one source and one destination? or "from" and "to" ?
Also when I tried using that (and had "try merge, make no changes" selected) it ended up taking a lot of files in trunk and attempting to replace them with older versions in the branch? I only want the latest branch changes to be merged into trunk.... I don't want trunk files overwritten with branch chagnes.

Something just doesn't seem right. I ended up doing the merge from the comamnd line and then using IDEA to commit the files in trunk, but there should be a way to do this merge within the IDE?

I'm about to switch to some other SVN gui tool since I'm always having issues with anything other than basic commits in IDEA.

(As another issue, righ tnow I'm trying to right click on my project and compare the trunk version with a branch version and I end up with this error which doesn't even make sense to me):
https://www.evernote.com/shard/s14/sh/548d05f1-8674-4fde-bf9e-0b7b69fee815/2b2d449e8eb9aad5caa1831c8c8b836e

Why the heck is it looking for the dir trunk under branches/VERSION-1.1/trunk ?

When I do configure branches it seems to look ok
https://www.evernote.com/shard/s14/sh/546baeff-2b88-458a-bb0a-e5f85e5beca6/10b651cce95cb857f7dc8005595f8bdd

2 comments

Am I the only one that finds the IDEA svn merge functionality non-intuitive? in SmartSVN it's intuitive where I'm merging from and what I'm merging into. In IDEA's interface it's much more cofusing.

0

Hello Rick,
1. You can use command "merge from" for merging branch to trunk. Warning message was added because of regulations, I think. We will discuss need of this warning
2. I create issue in youtrack about renaming "source1" and "source2" to "from" and "to"
http://youtrack.jetbrains.com/issue/IDEA-105127

0

Please sign in to leave a comment.