Difference between revisions of "Wales Group Version control"

From CUC3
Jump to navigation Jump to search
import>Csw34
import>Csw34
Line 1: Line 1:
 
We are now in the final stages of putting the group code under version control. GMIN and PATHSAMPLE, along with the CHARMM and AMBER code used with them have been added to the repository. OPTIM will be added soon. Once stable versions of the source code have been added - the next step is to set up the nightly test suite for each code, and move the documentation into the repository.
 
We are now in the final stages of putting the group code under version control. GMIN and PATHSAMPLE, along with the CHARMM and AMBER code used with them have been added to the repository. OPTIM will be added soon. Once stable versions of the source code have been added - the next step is to set up the nightly test suite for each code, and move the documentation into the repository.
   
RSS feeds (including diffs of files that have been changed) are generated every 10 minutes from the SVN log files. There is more info here (INSERT LINK)
+
RSS feeds (including diffs of files that have been changed) are generated every 10 minutes from the SVN log files any uploaded to the CUC3 web server. There is currently one feed per top level directory in the repository. This corresponds to:
  +
  +
trunk_log.xml - contains the logs/diffs for every change to the code
  +
gmin_log.xml - only contains the logs/diffs when code in the GMIN directory is changed
  +
pathsample_log.xml - only contains the logs/diffs when code in the PATHSAMPLE directory is changed
  +
charmm_log.xml - only contains the logs/diffs when code in the CHARMM31 directory is changed
  +
amber_log.xml - only contains the logs/diffs when code in the AMBER directory is changed
  +
  +
   
 
==Usage tips==
 
==Usage tips==

Revision as of 16:25, 11 July 2008

We are now in the final stages of putting the group code under version control. GMIN and PATHSAMPLE, along with the CHARMM and AMBER code used with them have been added to the repository. OPTIM will be added soon. Once stable versions of the source code have been added - the next step is to set up the nightly test suite for each code, and move the documentation into the repository.

RSS feeds (including diffs of files that have been changed) are generated every 10 minutes from the SVN log files any uploaded to the CUC3 web server. There is currently one feed per top level directory in the repository. This corresponds to:

trunk_log.xml - contains the logs/diffs for every change to the code gmin_log.xml - only contains the logs/diffs when code in the GMIN directory is changed pathsample_log.xml - only contains the logs/diffs when code in the PATHSAMPLE directory is changed charmm_log.xml - only contains the logs/diffs when code in the CHARMM31 directory is changed amber_log.xml - only contains the logs/diffs when code in the AMBER directory is changed


Usage tips

Make sure you followed the setup instructions on the group SVN page (INSERT LINK). The procedure includes setting up a template file. This ensures that all posts are in the same basic format!

What follows are a few suggestions to make using SVN a joyful experience. Please add any others you think are important! In general you should:

  • run 'svn update' on a regular basis to ensure you have the latest bug fixes
  • always do an 'svn update' before you do 'svn commit'
  • commit your changes regularly. If you wait a two months before commit your changes, you're likely to have to resolve more conflicts in parts of the code that has been changed by others in the meantime.
  • if you get a conflict (C flag) when running 'svn update', find out who introduced the change and talk to them about it.