Adding this directory and contents to CVS server: ==> after creating MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov ==> not discussed here cd /home cvs co -d web MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov cd web cvs -q up cvs add *.html *.txt favicon.ico cvs -q up cvs commit ==> created a .cvsignore file for files or directories that ==> that should not be visible to CVS ==> make sure to remove file from .cvsignore prior to adding ==> to CVS tree cvs -q up cvs add .cvsignore meetings people products cd meetings cvs -q up cvs add * cd .. cvs -q up cvs commit cvs -q up ============================================================== Benji: we used the following commands to add html files to the MITgcm contrib CVS website : web directory already in CVS: /data1/pictures/www_ecco_group.org create mirror: /data5/ecco2_web_site/MITgcm_contrib/ cvs co /MITgcm_contrib/highres_cube/README (important copies the CVS link on to data5) mkdir ecco2_web cvs -q up -> returns a question what to do. cvs add ecco2_web -> add the directory to repository -> be sure if you want the directory name the way it is, it's messy to delete them.... repeat: cvs -q up -> ensures that you added the directory cp html files from skylla:/home/web/ cvs -q up -> asks for files cvs add *.html -> add all the files in the directory cvs -q up cvs commit -> returns prompt, enter text which appears on the website e.g. starting to populate ecco2_web ----------------------- demonstrated how to change a file and add it to the repository: changed the file website_improvements.txt on skylla ask for update cvs -q up -> returned prompt, that the file has changed. cvs add filename cvs commit -> enter text: changes in xyz cvs -q up or check website to see whether changes are online. -------------------------- Dimitris CVS Usage Notes ================================================================= To check out a clean, latest, working copy (Option -P is needed to remove empty directories): cvs checkout -P MITgcm To do an update, use cvs -q up -d -P to get any new directories. To see what files have changed but without updating: cvs -n update To check out and rename a directory cvs co -d 2005 www.ecco-group.org/ecco_2005_pub.html cvs co -d 2006 www.ecco-group.org/ecco_2006_pub.html cvs co -d 2007 www.ecco-group.org/ecco_2007_pub.html cvs co -d 2008 www.ecco-group.org/ecco_2008_pub.html ================================================================= JPL repository: To export a copy without CVS subdirectories: cvs export -D today mitgcmuv To check out a clean, latest, working copy: cvs checkout -P mitgcmuv To checkout or export latest copy from a branch: cvs checkout -r branch_name mitgcmuv To checkout or export a particular version, e.g., that of 04/19/99 on branch c19-jpl-dimitri tagged R033099: cvs checkout -D "04/20/99" -r c19-jpl-dimitri mitgcmuv or cvs checkout -r R033099 mitgcmuv To create a branch based the current revision in the working copy: cvs tag -b branch_name cvs update -r branch_name To add a file cvs add file_name To add a binary file cvs add -kb file_name To remove a file cvs remove file_name To check for updates on working directory: cvs update To merge with branch for first time: cvs update -j other_branch For subsequent merges: cvs update -j other_branch:date_of_last_merge -j other_branch To commit changes: cvs commit To import a copy of the code on a vendor branch, merge changes in the main trunk, and tag it (note [-W "... -k 'b'"] is for binary files): cvs import -W "verification/exp2/SS* verification/exp2/*Lev* verification\ /exp2/t* verification/exp2/w* verification/exp5/E* verification/exp5\ /Q* verification/exp5/SS* verification/exp5/dQ* verification/exp5\ /*Lev* verification/exp5/w* -k 'b'" mitgcmuv c19-jpl c19_990824 cvs checkout -jc19-jpl:yesterday -jc19-jpl mitgcmuv cvs commit cvs tag c19_990824