Subversion> Merging back into the trunk without reintegration?

Question

This is a stupid question, but it works at work enough that I would like to ask in order to get a second opinion. You can assume that we are using Subversion 1.6 +.

Here is the scenario - let's say I have Tuba. I embed Trunk in revision 10 to create Branch1 and start making my own changes to Branch1.

Meanwhile, Branch2 is being created from Trunk Revision 30. Branch2 has several fixes. [/ p>

At some point, the work ends in Branch2, and its changes are merged back into Trunk WITHOUT using -reintegrate.

I am still happily working in Branch1, but now I want to make sure that I have ALL the latest changes from Trunk and any code changes made in other branches that are merged back into the trunk (i.e. Branch2).

The bottom line is: if I merged Trunk into Branch1, will I see all the changes that were merged back into the trunk from other branches, for example Branch2? Should I merge the changes into Branch2 URL separately and then merge it with the trunk URL to ensure that I have all the changes?

Answer 1

If I understand your example, you will receive changes that were merged into trunk, even if they were merged without using --reintegrate .

The problem with using --reintegrate is that if you were constantly updating Project3, periodically merging with trunk in Project3, then you would encounter a lot of conflicts when merging back into the trunk. This is due to the fact that he will try to accept these periodic mergers and again apply them to the body when they were already in the trunk.

But no matter how you merged, how long it’s now in the trunk.

By the way, your example is a bit confusing. First, you say things like "merge Project2 with a HEAD chest." Mergers have a direction; you must say that you "combine the trunk in Project2". In addition, usually the term “project” refers to what has a connecting line and branches, but in your example it seems that the trunk is in a different project than the branches.