next up previous contents
Next: Removing code from the Up: The PSI3Source Code Previous: Adding entirely new code   Contents

Updating checked out code

If the code in the main repository has been altered, other users' working copies will of course not automatically be updated. In general, it is only necessary to execute the following steps in order to completely update your working copy of the code:

  1. cd $PSI3
  2. cvs update -dP

This will examine each entry in your working copy and compare it to the most recent version in the main repository. When the file in the main repository is more recent, your version of the code will be updated. If you have made changes to your version, but the version in the main repository has not changed, the altered code will be identified to you with an ``M''. If you have made changes to your version of the code, and one or more newer versions have been updated in the main repository, CVS will examine the two versions and attempt to merge them - this process usually has conflicts however, and is sometimes unsuccessful. You will be notified of any conflicts that arise (labelled with a ``C'') and you must resolve them manually.

The -dP flags to cvs above will also ensure that any directories added to or removed from the main repository are also added or deleted in your working copy. Keep in mind, however, that the appearance of new directories will require you to re-run the configure script to compile the new codes. For example,

  1. cd $PSI3
  2. cvs update -dP
  3. autoconf
  4. cd $objdir
  5. $PSI3/configure -prefix=$prefix -verbose
  6. cd src/bin/great_code
  7. make install
This will check out any new code that has been added to the repository since the last time the cvs update command was issued, correctly update the configure script (assuming the programmer who added the code followed the steps from section 2.3 and edited the configure.in file), re-configure for the new code (note that you must run configure and not config.status here), and then compile the code.


next up previous contents
Next: Removing code from the Up: The PSI3Source Code Previous: Adding entirely new code   Contents
psi 2003-01-07