Glimmer: Tools: SVN

From CSWiki

Source code management systems help people deal with the fact that more than one person works on a project, and that the project has bunches of files.

Two aspects: The software that manages everything and the practices that benefit from the software (or vice versa).

Contents 1 Software Basics 2 First Action: Check out the project 3 Normal Work Pattern 4 Other Useful Activities

Software Basics

svn COMMAND OPTIONS

First Action: Check out the project

svn checkout REPOSITORY

Normal Work Pattern

• Update the repository

svn update

• Make some changes to files
• Make sure that your changes do not break things!
• Do another update to make sure that someone else hasn't updated your files while you were editing.
• Put your changes back into the repository
  • Everything that you've changed

svn commit

• • Only a few files

svn commit FILENAME0 FILENAME1 ...

• Type a sensible comment to explain what you've done.

Other Useful Activities

• Find what changes you've made

svn diff

• • Or

svn diff FILENAMES

• • Or

svn diff -R

• Find out a list of all the updates to a file

svn log FILENAME

• Indicate that a conflict has been resolved (that is, "I've dealt with the junk you just inserted in the file.")

svn resolved FILENAME