[Subclipse-users] Merging changes from a branch back to the trunk

Hi everybody.

I'm newbie in SVN and I'm using Subclipse v.1.2.0. I have the following
scenario here at my company:

- The trunk is the main line of development and I have developers working at
it.
- For every major system changes we generate a branch, which is just copy of
the trunk directory.

After finish working on the branch, we want to merge all the changes on the
branch back to the trunk. I've created the following test scenario:

- The trunk has just one class called TrunkClass.java.
- The branch has two classes: TrunkClass.java (which was obtained from the
copy of the trunk directory) and BranchClass.java.

I've done some changes at TrunkClass.java from the trunk. I've also done
some changes at TrunkClass.java from the branch. I want to merge these
changes from the branch back to the trunk. So after doing the merge we would
end up with the class BranchClass.java added at the trunk directory and the
changes made at TrunkClass.java from the branch would be merged with the
changes at the same class from the trunk, right? No! In fact, the
BranchClass.java was added to the trunk, but we've lost the changes that
we've done at TrunkClass.java from the trunk! This class was replaced with
the one from the branch!

When doing the merge, I'm selecting the trunk's url at the FROM field with
HEAD revision and I'm selecting the branch's url at TO field with HEAD
revision.

Once again, all that I want to do is to generate a branch based on the
trunk, do some changes at the branch and then merge this changes back to the
trunk.

Does anybody can help me saying what is going wrong at the merge process
that I'm doing?

Thanks in advance,

-- 
Tiago Corrêa de Melo
Analista de Sistemas / Tradutor
Sun Certified Java Programmer
Sun Certified Associate for Java Platform
Sun Certified Web Component Developer