[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Newbie checking he understands what he's doing!

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 2 Nov 2009 09:57:58 -0500

> I'm new to subversion and Tortoise svn (and very impressed by its
> ease of use).
> 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 conflicts)

You only need to select revisions if you don't want all un merged revisions to be merged. This is a feature of the merge tracking added to svn in 1.5+.

> 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?

It doesn't really matter when you do the branch. But, I usually start it ahead of time. You will gain aloof info by reading the free svn book http://svnbook.red-bean.com/nightly/en/ especially chapter 4 on branching and merging with particular focus on the branching strategies section.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-02 15:58:01 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.