Although my preference these days is to use GIT for SCM, due to legacy reasons I’m still using Subversion for many projects and this post aims, for the sake of my own memory, to provide a short example of traditional subversion branching that will cover:
- Creating a branch
- Merging changes in the trunk into a branch
- Merging a branch back into the trunk
- Tagging trunk as version X.X.X
I prefer to do this just using svn rather than using the svnmerge tool(s), those tools do work OK but I prefer to retain total control. Wherever possible always use the --dry-run option to test the command out before running them for reall as this gives you a (sometimes lifesaving) chance to change your mind.