I'm new to subversion and Tortoise svn (and very impressed by its ease of
Up till now my company hasn't really used its ability to branch and tag, if
someone has a sec to make sure I am following reasonable practice I would be
grateful. So using Tortoise SVN 1.6.5, Subversion 1.5.6, this is the
sequence I followed/intend to follow regarding branches:
1. I created a working copy of the trunk to experiment with some
changes. I used SVN Update on a regular basis to pick up changes to the
trunk and resolve conflicts. All works very nicely.
2. After a while I started to have a large body of pending changes
which could not be checked into the trunk as they still cause breakage. So I
created a branch. To do this I used Tortoise SVN>Branch/tag, with options
"Create the branch from working copy" and "switch working copy to new
branch" (after first doing an SVN Update and resolving any conflicts)
3. I can now make changes in my working copy, check them into the
branch, and update my working copy to match any changes made to the branch.
4. I also need to periodically merge changes made to the trunk into
the branch (and then merge again into my working copy), resolving conflicts.
To do this I use "Merge a range of revisions". I select the trunk as the
"URL to merge from". I also need to look at the log of revisions to the
trunk, and only select "recent" ones (else I get a lot of spurious
5. Once my branch is working, I will use "Reintegrate a branch" to
merge my changes down into the trunk.
If I were doing this again, I think it would have been better to create the
branch prior to doing any modifications. In this case instead of steps 1 and
2 above I would have used "Create copy from HEAD revision", and checked out
from that branch. Steps 3 on would be the same.
Does this sound right?
As an aside, working through step 2 in practice I made a mistake, tried to
correct it, and ended up locking up my working copy - in the end I had to
blow it away and recreate it. I think the cause might have been my using
repo-browser to rename a folder in the repository - presumably this is only
safe if no-one has copies from that folder?
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-02 14:43:40 CET