Geek Answers Handbook

Reintegrate into a branch (not trunk) in Subversion (SVN)

I know that in Subversion (SVN) 1.6 there is an option --reintegrateto merge the function branch back into the trunk.

My workflow is a bit more complicated:

We have function branches - we often combine the trunk. But we do not return them back to the trunk. Instead, we create a trunk release branch and merge function branches to release the branch. At this stage, we get a lot of tree conflicts (since many changes exist both in the feature branches and in the trunk).

The option --reintegrateshould help in this scenario, but it --reintegratedoesn't seem to work when merging with a branch other than the trunk. It's true?

+5
source share
1 answer

It seems to me that you cannot use the option --reintegratefor any branch except trunk. Subversion has no standard for naming or placing branches, so there is no way to trunkbe special. For the Subversion, branches, trunkand tagsare simply directories. These guides are only special for us, because we said so.

--reintegrate , A B, B A, A, A. --reintegrate Subversion , B, A.

, . , --reintegrate trunk. . , Subversion, , trunk , , , .

+4

More articles:


All Articles