SVN Use Cases – Command Line usage – Merge / Branch / Trunk

Create a branch from trunk

svn copy svn://wetware.co.nz/svn/projectname/trunk \
svn://wetware.co.nz/svn/projectname/branch/new_feature -m “initial branch”

Checkout that branch

svn co svn://wetware.co.nz/svn/projectname/branch/new_feature

Add to that branch

svn st | grep ^? | grep -v \.log | cut -b7- | xargs svn add

Commit changes

svn commit . -m “A message about my changes. The bug #123 is now fixed”

Merge trunk to branch

Go into your branches directory.
svn up
svn log –stop-on-copy
Take note of the initial branch revision rXXXX

svn merge -r XXXX:HEAD svn://wetware.co.nz/svn/projectname/trunk

Posted on April 18, 2009 at 2:31 pm by Jordan Carter · Permalink
In: Web Development · Tagged with: , ,

Leave a Reply