SVN

This is just notes for my self.

To set the $Id$ in an file use the following command

$ svn propset svn:keywords "Id" filename

Make a new branch

$ svn copy https://janus-ssp.googlecode.com/svn/trunk/ https://janus-ssp.googlecode.com/svn/branches/v.x.x

Change to branch/tag/trunk

$ svn switch https://janus-ssp.googlecode.com/svn/trunk/

Diff between a branch and trunk

$ svn diff https://janus-ssp.googlecode.com/svn/branches/v.x.x/{CURRENT_DIR}/{FILE_TO_DIFF} https://janus-ssp.googlecode.com/svn/trunk/CURRENT_DIR}/{FILE_TO_DIFF}

How to get log entries on code from latest tag to now

$ svn log --stop-on-copy -r HEAD:{LATEST_TAG} https://janus-ssp.googlecode.com/svn/branches/v.X.X/

Merging a patch from a branch to trunk (when patching a branch)

$ svn switch https://janus-ssp.googlecode.com/svn/trunk

Go into dir of file to merge {CURRENT_DIR}. I.e. www/install/

$ svn merge -r {BRANCH_REV}:HEAD https://janus-ssp.googlecode.com/svn/branches/v.x.x/{CURRENT_DIR}/{FILE_TO_MERGE}

Applying a diff patch

$ patch -p0 < {DIFF-FILE}