[Subclipse-users] Merge: unified diff works, but merge does nothing

I'm running subclipse 1.4.7. When I use the team -> merge tool it gives the correct diff when I try the Unified Diff button, but then when I click the Merge button it looks busy for few seconds and then exits looking like everything is fine.

However, there are no changes to the file I merged.

I'm doing a merge from one file on a branch at revision 6328 to the same file on the trunk at revision 5148. I expect to see the file on the trunk modified with the changes shown in the Unified Diff to make it identical to the file on the branch at r6328. Nothing happens, however.

In the bottom section of the Merge dialog there is a read-only field under "The result of the merge is stored in the working copy at:". It gives a location that does not hold a working copy, however. When I use the Select button next to it it shows a list of file revisions. If I select one of the revisions and click OK there is no change. This button has no effect.

Am I missing something or is the merge just broken?

Thanks.

Dean

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1508086

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-04-01 17:34:32 CEST