RE: Branch/switch/merge question
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 26 Nov 2013 17:18:00 +0000
> I've read the visual guide, the subversion book, I've used subversion for
Are you using svn 1.8?
If not, are you doing reintegration merge when merging your branch back in to the trunk?
> So, most importantly, am I using svn branch/switch/merge in the way that it's
Generally, there isn't a reason to branch as a matter of course. It's not wrong per say... but I'd rather see all the work just done in trunk. Branches would be used for larger features that multiple people might collaborate on, or take longer than a day or so.
Although, having each developer work only on a branch does facilitate code reviews. You do your work on a branch, someone reviews it, once ok'ed it gets merged to branch.
Also, I suggest people avoid using switch. It is too easy to forget which svn path you are currently pointing to and commit something to the wrong path. Also, svn switch doesn't handle non-versioned stuff as well as say GIT does. I'd much rather see our devs check out trunk and branch to separate local working copies.
This is an archived mail posted to the Subversion Users mailing list.