Subversion Tutorial

This is a short tutorial on  Subversion.

• Retrieving the latest version from the server to the directory DIR

  svn co https://coolfluidsrv.vki.ac.be/svn/... DIR
  

• Updating the local version to the latest version

  cd DIR (base directory) 
  svn update
  

• Status of the current local version

  svn status
  ? src/Framework/SubSystem.cxx  (Not version controlled)
  A src/Framework/SubSystem.cxx  (Added File)
  C src/Framework/SubSystem.cxx  (Conflicting update)
  G src/Framework/SubSystem.cxx  (Automatically merged)
  D src/Framework/SubSystem.cxx  (Deleted File)
  

• Adding a file

  svn add src/Framework/SubSystem.cxx
  

• Submitting (committing) changes to the server

  svn commit [DIR or FILE]
  

• Version Info

  svn info
  

• Revert a file (undo the local changes not yet committed)

  svn revert src/Framework/SubSystem.cxx
  

• Resolve Conflicts
  • Manually resolve conflict
  • Inform svn that conflict has been resolved

svn resolved src/Framework/SubSystem.cxx 

• Check differences between local file and server file

  svn diff src/Framework/SubSystem.cxx
  

• Look at logs of the file

  svn log src/Framework/SubSystem.cxx
  

• Revert changes ALREADY commited. Use log to see last revision and then:

  svn merge -r362:360 src/Framework/SubSystem.cxx
  svn ci src/Framework/SubSystem.cxx
  

Some usefull links

 Subversion Crash Course - Part 1

 Subversion Crash Course - Part 2