JerryKur
JerryKur

Reputation: 7519

svn creating branch of branch

We have a branch we are working from and I now want to create a branch from this branch to add some new features to the branch. How cam I do this is such a way that I can easily sync down the changes made to the parent branch and merge my changes into the parent branch?

We are using TortiseSVN.

Thanks!

Upvotes: 1

Views: 389

Answers (2)

Legolas
Legolas

Reputation: 1502

As branching is merely a copy operation, branching from a branch is equal to branching from trunk or any other directory you may want to branch. I would recommend the SVN book for a more in depth explanation of branching: http://svnbook.red-bean.com/en/1.5/svn.branchmerge.using.html.

Upvotes: 0

Hanan
Hanan

Reputation: 1445

YourProject/
           /trunk - main line of development
           /branch1 - made by the 'copy' command on trunk
           /branch2 - made by the 'copy' command on 'branch1'

You can safely think of branch2 as you would think of branch1 and merge directly from branch2 to trunk as it is a branch (or more accurately a copy) of trunk.

I recommend you to read in svn book (I think the PDF edition is the best) up to and including the chapter of 'basic branching and merging'.

Upvotes: 1

Related Questions