I am trying to merge my development branch back into the trunk of my repo. Steps I took:

1. Switch to trunk
2. check that it is up to date, resolve any conflicts
3. Go to Team->Merge
4. Select URL : development branch
5. Start Revision: Revision when branch was created
6. End Revision: HEAD
7. OK

This should do the magic - it opens up the syncronize view which is fine, shows me all the conflicts, but there the problem happens:

In the compare editor I see two files:
Local File | Remote File (306)

This is really strange, the revision number of the remote file is actually the one of the file in the working copy (trunk) and so is the content. The local file has the content of the file in the branch.

Now the arrow shows correctly that I am merging from left to right (branch to trunk). This also happens when I click ok.

BUT I can only move changes from right to left!!! That's not what I want - I do not want to overwrite the changes in the branches with the old content of the trunk. I want to move the content from left (branch) to right (trunk). But I can't even write in the right file.

I do not know why it writes remote file there?? It's clearly showing the working copy file in the remote file window, and the file from the branch (for merging) is shown in local file.

Some bug in Subversive?

Thx,
Martin