williamblevins edited this page Jun 15, 2015 · 2 revisions

These instructions use outdated workflow based on svnmerge tool.

This flow sets up a branch for a potential series of point releases.


  • steal comments and examples from BranchAndMerge
  • add some setup for ReleaseConfig
  • Init SVN ...
$ export SVN=`  
$ export POINT=3.2.x`  

Create point branch...

$ cd my_working_directory
$ svn co $SVN/trunk
$ svn cp trunk $SVN/branches/$POINT
$ svn commit -m 'Added branches/$POINT based on trunk' trunk

I don't know why that last line is needed...

Set svnmerge base...

$ svn co $SVN/branches/$POINT working
$ (cd working && svnmerge init ../trunk)
$ (cd trunk && svnmerge init ../working)
$ (cd working && svn commit -m 'Set svnmerge base for $POINT')
$ (cd trunk && svn commit -m 'Set svnmerge base for trunk')

You can actually do both the svnmerge init and svn commit on one branch (in one directory) and then do both on the other branch, but doing it this way makes both of them end up with the same base revision number in the svnmerge property, which is nice and symmetric.

Clone this wiki locally
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.
Press h to open a hovercard with more details.