Menu
I've been doing some minor fixes on the trunk, but I am wishing I would have branched out for what I'm doing now. What's the easiest way to do this in Tortoise SVN now?
I'm thinking that this is what the "Working Copy" option is for when branching, but I see the following explanation:
Working copy - The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already.
and it makes me wonder if the part in bold is referring to updating the trunk or the new branch you're about to create. I would think the latter but just wanted to check before I do it. Or if there's another way I should do this please let me know. Thanks!
318
Subversion Branching StrategiesSubversion branches (SVN branches) allow your team to work on multiple versions of your code simultaneously. Developers can test out new features without impacting the rest of development with errors and bugs. SVN's “branch” directory runs parallel to the “trunk” directory.
If you want to merge changes into a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using TortoiseSVN → Merge.... In general it is a good idea to perform a merge into an unmodified working copy.
Yes, Working Copy is exactly the option you want. The transferring of data it is referring to is for the new branch, not the trunk (i.e. you may have added new files locally that don't yet exist in the repository - they will be added to the branch).
171
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
