问题
Our code repository includes: * trunk, * branch A - starts from trunk, * branch B - starts from branch A,
The programer that works on branch A wants to reintegrate it into the trunk, and continue working on the trunk only.
We do not want to reintegrate branch B into branch A yet.
Is it possible to have branch B relate to the trunk, instead of to branch A, so that the two programmers can continue to work separately on trunk and on branch B?
(I hope my question is clear)
回答1:
As I see it, you have following situation:
And you are going to do merge from A to trunk:
As you see, B has started from A and has its content. It cannot be changed to start from another codebase because it already exists. All you can do is merge changes from trunk to B after you have merged changes from A to trunk. In this case branch B will have actual content of both trunk and branch A:
回答2:
Both trunk and all the branches are just some folders with some files in them. You are allowed to merge anything with anything else. So, the answer is that there's no exact concept of "relation", but one is not actually needed.
来源：https://stackoverflow.com/questions/8665878/svn-branch-of-a-branch