Search code examples
svnmergesubclipse

Subclipse: Merging from Trunk to Branch; No revisions are eligible for merge


I'm trying to setup a branch of my main project. I have the branch created. I have my working copy(the branch) updated and checked out and I have the trunk updated and checked out.

I right click on my branch, the working copy and click Team > Merge. I then get the CollabNet Merge dialog. I choose Merge a range of revisions. I then hit next and it performs the pre-merge best practices. Once that's complete nothing happens and I'm able to hit next again. I hit next again and nothing happens except I get the message "No revisions are eligible for merge".

Any suggestions on what I'm doing wrong with this?


Solution

  • I am not sure why you have trunk checked out. I am going to ignore that. You want to start with just your branch checked out. In the merge dialog you do not say whether it already had /trunk entered as the path to merge from. But that would need to be done.

    Then in terms of revisions, well, have their been commits made to trunk since the branch was created? If not, then there are no revisions to merge to the branch. That seems to be what SVN is saying.

    You do not even have to specify revisions, you can just say to merge all revisions and SVN will figure out what changes have happened in trunk since the revision the branch was created from.