Version 1 (modified by lawrence, 14 years ago) (diff)


Subversion cheat sheet (basic workflow)

Set an environment variable, e.g:

export SROOT=svn+ssh://

For regular use, put it in your .profile (e.g .bash_profile)

Checkout a working copy:

svn co $SROOT/TI01-discovery/trunk/ 

You should only need to do this once, then in future you can use update: Update working copy (will replace your local copy with the latest from repository).:

svn update

Make changes

  • Do some work.
  • You may also want to add or remove some files to/from your working copy.
       svn add myfile/dir
       svn delete myfile/dir
       svn copy myfile/dir
       svn move myfile/dir
       svn mkdir mydir

Examine your changes

  • Compare your local copy to the repository:
        svn status
        svn diff
        svn revert (throw away your work!)
  • Merge other’s changes (with Update)
    svn update

If you get a conflict fix it by one of the following:

fix by hand
copy one of three temp files over your own
use svn revert (throw away your work again!)

then use

svn resolved

to tell subversion the conflict is resolved.

Commit your changes:

svn commit