Question

I have a trunk (A) and two branches (B and C). When I merge A with C its OK, after I merge A with B, the previous C its overwriten and my trunk don’t have the C changes.

What I want is A + B + C into trunk after merges.

Edited for more explanation:

1. In trunk I have 3 files: “FILE 1”, “FILE 2” and “FILE 3”;
2. I create a branch from trunk as “Branch 1”;
3. I switch to “Branch 1”, I fix bugs into “FILE 1” file and commit;
4. In the same time, another person create a branch from trunk as “Branch 2”;
5. This person fix another bugs into “FILE 2” and “FILE 3” files and commit;
6. The “Branch 2” is approved for publish, then I merge “Branch 2” to “trunk” (its ok);
7. In next day the “Branch 1” is approved, then I merge “Branch 1” to “trunk”, and the “trunk” lose the changes from “Branch 2”.

Answer 1

1. Make a working copy of trunk
2. svn merge -r W:X svn://branchA workingCopy
3. svn merge -r Y:Z svn://branchB workingCopy

I think this will give you what you want, which is the trunk plus any changes made by either branch. You will have to deal with conflicts, however.