| 1 |
dimitri |
1.1 |
Adding this directory and contents to CVS server: |
| 2 |
|
|
|
| 3 |
dimitri |
1.2 |
==> after creating MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov |
| 4 |
|
|
==> not discussed here |
| 5 |
dimitri |
1.1 |
|
| 6 |
|
|
cd /home |
| 7 |
|
|
cvs co -d web MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov |
| 8 |
|
|
cd web |
| 9 |
|
|
cvs -q up |
| 10 |
dimitri |
1.2 |
cvs add *.html *.txt favicon.ico |
| 11 |
|
|
cvs -q up |
| 12 |
|
|
cvs commit |
| 13 |
|
|
|
| 14 |
|
|
==> created a .cvsignore file for files or directories that |
| 15 |
|
|
==> that should not be visible to CVS |
| 16 |
|
|
==> make sure to remove file from .cvsignore prior to adding |
| 17 |
|
|
==> to CVS tree |
| 18 |
|
|
|
| 19 |
|
|
cvs -q up |
| 20 |
|
|
cvs add .cvsignore meetings people products |
| 21 |
|
|
cd meetings |
| 22 |
|
|
cvs -q up |
| 23 |
|
|
cvs add * |
| 24 |
|
|
cd .. |
| 25 |
|
|
cvs -q up |
| 26 |
dimitri |
1.3 |
cvs commit |
| 27 |
|
|
cvs -q up |
| 28 |
dimitri |
1.1 |
|
| 29 |
|
|
|
| 30 |
|
|
============================================================== |
| 31 |
|
|
|
| 32 |
|
|
Benji: |
| 33 |
|
|
we used the following commands to add html files to the |
| 34 |
|
|
MITgcm contrib CVS website : |
| 35 |
|
|
|
| 36 |
|
|
|
| 37 |
|
|
web directory already in CVS: |
| 38 |
|
|
/data1/pictures/www_ecco_group.org |
| 39 |
|
|
|
| 40 |
|
|
|
| 41 |
|
|
create mirror: |
| 42 |
|
|
/data5/ecco2_web_site/MITgcm_contrib/ |
| 43 |
|
|
|
| 44 |
|
|
cvs co /MITgcm_contrib/highres_cube/README |
| 45 |
|
|
|
| 46 |
|
|
(important copies the CVS link on to data5) |
| 47 |
|
|
|
| 48 |
|
|
mkdir ecco2_web |
| 49 |
|
|
|
| 50 |
|
|
cvs -q up -> returns a question what to do. |
| 51 |
|
|
|
| 52 |
|
|
cvs add ecco2_web -> add the directory to repository |
| 53 |
|
|
-> be sure if you want the directory name the way it is, it's messy to |
| 54 |
|
|
delete them.... |
| 55 |
|
|
|
| 56 |
|
|
repeat: |
| 57 |
|
|
|
| 58 |
|
|
cvs -q up -> ensures that you added the directory |
| 59 |
|
|
|
| 60 |
|
|
cp html files from skylla:/home/web/ |
| 61 |
|
|
|
| 62 |
|
|
|
| 63 |
|
|
cvs -q up -> asks for files |
| 64 |
|
|
|
| 65 |
|
|
cvs add *.html -> add all the files in the directory |
| 66 |
|
|
|
| 67 |
|
|
cvs -q up |
| 68 |
|
|
|
| 69 |
|
|
cvs commit -> returns prompt, enter text which appears on the website |
| 70 |
|
|
|
| 71 |
|
|
e.g. starting to populate ecco2_web |
| 72 |
|
|
|
| 73 |
|
|
----------------------- |
| 74 |
|
|
|
| 75 |
|
|
demonstrated how to change a file and add it to the repository: |
| 76 |
|
|
|
| 77 |
|
|
changed the file website_improvements.txt on skylla |
| 78 |
|
|
|
| 79 |
|
|
ask for update |
| 80 |
|
|
cvs -q up -> returned prompt, that the file has changed. |
| 81 |
|
|
cvs add filename |
| 82 |
|
|
cvs commit -> enter text: changes in xyz |
| 83 |
|
|
|
| 84 |
|
|
cvs -q up or check website to see whether changes are online. |
| 85 |
|
|
|
| 86 |
|
|
|
| 87 |
|
|
-------------------------- |
| 88 |
|
|
|
| 89 |
|
|
|
| 90 |
|
|
|
| 91 |
|
|
|
| 92 |
|
|
|
| 93 |
|
|
Dimitris CVS Usage Notes |
| 94 |
|
|
|
| 95 |
|
|
================================================================= |
| 96 |
|
|
|
| 97 |
|
|
To check out a clean, latest, working copy |
| 98 |
|
|
(Option -P is needed to remove empty directories): |
| 99 |
|
|
cvs checkout -P MITgcm |
| 100 |
|
|
|
| 101 |
|
|
To do an update, use |
| 102 |
|
|
cvs -q up -d -P |
| 103 |
|
|
to get any new directories. |
| 104 |
|
|
|
| 105 |
|
|
To see what files have changed but without updating: |
| 106 |
|
|
cvs -n update |
| 107 |
|
|
|
| 108 |
|
|
To check out and rename a directory |
| 109 |
|
|
cvs co -d 2005 www.ecco-group.org/ecco_2005_pub.html |
| 110 |
|
|
cvs co -d 2006 www.ecco-group.org/ecco_2006_pub.html |
| 111 |
|
|
cvs co -d 2007 www.ecco-group.org/ecco_2007_pub.html |
| 112 |
|
|
cvs co -d 2008 www.ecco-group.org/ecco_2008_pub.html |
| 113 |
|
|
|
| 114 |
|
|
|
| 115 |
|
|
================================================================= |
| 116 |
|
|
|
| 117 |
|
|
JPL repository: |
| 118 |
|
|
|
| 119 |
|
|
To export a copy without CVS subdirectories: |
| 120 |
|
|
cvs export -D today mitgcmuv |
| 121 |
|
|
|
| 122 |
|
|
To check out a clean, latest, working copy: |
| 123 |
|
|
cvs checkout -P mitgcmuv |
| 124 |
|
|
|
| 125 |
|
|
To checkout or export latest copy from a branch: |
| 126 |
|
|
cvs checkout -r branch_name mitgcmuv |
| 127 |
|
|
|
| 128 |
|
|
To checkout or export a particular version, e.g., that of |
| 129 |
|
|
04/19/99 on branch c19-jpl-dimitri tagged R033099: |
| 130 |
|
|
cvs checkout -D "04/20/99" -r c19-jpl-dimitri mitgcmuv |
| 131 |
|
|
or |
| 132 |
|
|
cvs checkout -r R033099 mitgcmuv |
| 133 |
|
|
|
| 134 |
|
|
To create a branch based the current revision in the working copy: |
| 135 |
|
|
cvs tag -b branch_name |
| 136 |
|
|
cvs update -r branch_name |
| 137 |
|
|
|
| 138 |
|
|
To add a file |
| 139 |
|
|
cvs add file_name |
| 140 |
|
|
|
| 141 |
|
|
To add a binary file |
| 142 |
|
|
cvs add -kb file_name |
| 143 |
|
|
|
| 144 |
|
|
To remove a file |
| 145 |
|
|
cvs remove file_name |
| 146 |
|
|
|
| 147 |
|
|
To check for updates on working directory: |
| 148 |
|
|
cvs update |
| 149 |
|
|
|
| 150 |
|
|
To merge with branch for first time: |
| 151 |
|
|
cvs update -j other_branch |
| 152 |
|
|
|
| 153 |
|
|
For subsequent merges: |
| 154 |
|
|
cvs update -j other_branch:date_of_last_merge -j other_branch |
| 155 |
|
|
|
| 156 |
|
|
To commit changes: |
| 157 |
|
|
cvs commit |
| 158 |
|
|
|
| 159 |
|
|
To import a copy of the code on a vendor branch, merge changes in the main |
| 160 |
|
|
trunk, and tag it (note [-W "... -k 'b'"] is for binary files): |
| 161 |
|
|
cvs import -W "verification/exp2/SS* verification/exp2/*Lev* verification\ |
| 162 |
|
|
/exp2/t* verification/exp2/w* verification/exp5/E* verification/exp5\ |
| 163 |
|
|
/Q* verification/exp5/SS* verification/exp5/dQ* verification/exp5\ |
| 164 |
|
|
/*Lev* verification/exp5/w* -k 'b'" mitgcmuv c19-jpl c19_990824 |
| 165 |
|
|
cvs checkout -jc19-jpl:yesterday -jc19-jpl mitgcmuv |
| 166 |
|
|
cvs commit |
| 167 |
|
|
cvs tag c19_990824 |
| 168 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph