Menu
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)
336
and tags, and then just "ls". You can run "svn list -h" for more info on list.
Alternatively, select the source folder in the SVN Repositories tool window and choose the Branch or Tag command from the context menu. In the Create Branch or Tag dialog that opens, in the Copy From section, specify the source folder that will be copied to a branch or a tag.
Select the folder in your working copy which you want to copy to a branch or tag, then select the command TortoiseSVN → Branch/Tag.... If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure.
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:
135
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
