svn support: merge from one working copy to another working copy

Does IDEA support doing a svn merge from one working copy to another working copy?

Let's say I am working on one branch and committing my changes over time.
Then I want to merge my changes back into the trunk, but I want to do it on a local working
copy of the trunk so that I can test it prior to committing to the trunk.

Can I do this within IDEA?

The Update->Merge capability looks like it would merge directly into the repository. Is this
true?

1 comment
Comment actions Permalink

I would recommend doing a Subversion merge outside of IDEA. Update >
Merge does merge on a local copy, not in the repository. But if I
interpret what I'm seeing here correctly IDEA never does an actual merge
but overwrites files from the trunk with the changed files from the
branch. Not very useful.

Bas

Tim Haley wrote:

Does IDEA support doing a svn merge from one working copy to another working copy?

Let's say I am working on one branch and committing my changes over time.
Then I want to merge my changes back into the trunk, but I want to do it on a local working
copy of the trunk so that I can test it prior to committing to the trunk.

Can I do this within IDEA?

The Update->Merge capability looks like it would merge directly into the repository. Is this
true?

0

Please sign in to leave a comment.