SVN Workflow

svn_workflow.sh

# create working directory from trunk
svn checkout http://somedomain.com/repo/trunk

# create a branch
svn copy http://somedomain.com/repo/trunk \
         http://somedomain.com/repo//branches/feature-do-awesome-thing \
         -m "Created branch to implement feature do awesome thing."

# switch working copy
svn switch ^/repo/branches/feature-do-awesome-thing

# in beanstalk you have to type the whole address, in that case:
svn switch https://[email protected]/repo/branches/feature-do-awesome-thing

# delete a branch
svn rm https://[email protected]/repo/branches/feature-do-awesome-thing \
    -m "Removed branch feature-do-awesome-thing for xxx purpose."

# restore deleted branch
svn copy http://somedomain.com/repo/branches/feature-do-awesome-thing@123 \
         http://somedomain.com/repo//branches/feature-do-awesome-thing \
         -m "Restore deleted branch feature-do-awesome-thing."

# merge a branch
svn merge https://[email protected]/repo/trunk

# resolve conflict
svn resolve --resolve (working|theirs-full|mine-full) path/to/file

# resolve tree conflict
# e.g.: local add, incoming add upon merge
svn resolve --resolve working -R .