ecco2_web/ecco2.jpl.nasa.gov/website_cvs_notes.txt

Adding this directory and contents to CVS server:

After creating MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov

cd /home
cvs co -d web MITgcm_contrib/ecco2_web/ecco2.jpl.nasa.gov
cd web
cvs -q up
cvs add *.html


==============================================================

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