How to merge from branch to trunk in Eclipse using Subclipse?

Question

I am using the Subclipse plugin in the eclipse IDE to commit and update my code. I need to merge the code from the branch to the trunk. As part of this, I ran into this problem. Here, my workaround allows me to merge a branch into a trunk.

• Right-click on the project → Command → Combine.
• Choose Merge two different trees.
• I set From URL to my branch. For example: http://abc.com:40/branches/appi1.1/src/demo.properties
• I also set the URL for my chest For example: http://abc.com:40/trunk/appi/src
• In both the URL and the URL sections, I selected the chapter title switch.
• In console I received a message: Merge abnormally completed

Lucrative, here is my error warning from the eclipse IDE.

PS: In my trunk code, demo.properties does not exist, but it is there in the branch code.

Answer 1

If you did not install the CollabNet federation client from the Subclipse update site, you must do so. The Subclipse merge option has not actually been updated to support merge tracking with Subversion 1.5.

The merge options are definitely incorrect. "Go to URL" is not a merge target, your working copy. The From and To URLs are two ranges of URLs / revisions for diff to create the merge that you want to apply to your working copy. In most cases, both URLs should be the same, and version numbers should be changed to reflect the range of changes you want to combine.

The new user interface created with the CollabNet Merge Client solves these problems and simplifies the implementation of the correct merge.

When using Subversion, merging a specific file should be avoided. Ideally, you should combine the whole tree, / branches / appi 1.1 in your example.