Skip to content

Instantly share code, notes, and snippets.

@rkuris
Last active August 29, 2015 14:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rkuris/068b361b5936d16a056d to your computer and use it in GitHub Desktop.
Save rkuris/068b361b5936d16a056d to your computer and use it in GitHub Desktop.
mkdir js-svn
cd js-svn
svnadmin create .
mkdir ../js
cd ../js
svn mkdir file:///Users/rkuris/js-svn/trunk -m 'create trunk'
svn co file:///Users/rkuris/js-svn/trunk
cd trunk
touch a b c
svn add a b c
svn commit -m 'first commit'
svn copy file:///Users/rkuris/js-svn/trunk file:///Users/rkuris/js-svn/js-branch -m 'create the js branch'
svn switch file:///Users/rkuris/js-svn/js-branch
echo hello Jeff > a
svn commit -m 'first commit on branch'
touch f
svn add f
svn commit -m 'second commit on branch'
svn switch file:///Users/rkuris/js-svn/trunk
svn merge file:///Users/rkuris/js-svn/js-branch
svn commit -m 'merging branch into trunk'
svn log -g
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment