Saturday, October 25, 2014

svn cookbook


# ** BRANCH ** #

# partial checkout
svn co -depth files https://server/path/trunk .
svn up --set-depth immediates

# switch from trunk to branch
svn switch https://svn/myproject/trunk/dev .

# same repository, can use shorthand:
svn switch ^/myproject/branches/r01_05 .


# ** CONFLICTS ** #

# list conflict
svn st | grep ^C

# resolve conflict
svn resolve --accept mine-full


# ** OTHERS.. **  #

#add recursively
svn update --force


# revert recursively
svn revert -R

# side-by-side diff
svn --diff-cmd diff --extensions -y diff

Labels: , , , ,