/[MITgcm]/mitgcm.org/usingcvstoget.html
ViewVC logotype

Diff of /mitgcm.org/usingcvstoget.html

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.2 by adcroft, Fri Jul 6 18:36:54 2001 UTC revision 1.3 by adcroft, Thu Sep 20 16:51:55 2001 UTC
# Line 31  updates from the repository" below). Eac Line 31  updates from the repository" below). Eac
31  with contain a directory "CVS". This contains information required by CVS  with contain a directory "CVS". This contains information required by CVS
32  to keep track of your file versions with respect to the repository. <i>Don't  to keep track of your file versions with respect to the repository. <i>Don't
33  edit the files in CVS</i>.  edit the files in CVS</i>.
34    <p>You can also "check out" a particular version of the code. We use the
35    notion of checkpoints to indicate the evolution of the code. To specify
36    which "tag" you require use the -r option:
37    <blockquote>
38    <pre>cvs co -d <i>directory</i> -P -r checkpoint40 models/MITgcmUV</pre>
39    </blockquote>
40    
41  <h2>  <h2>
42  Show changes that YOU have made</h2>  Show changes that YOU have made</h2>
43  If you are running into difficulties it is very useful to see the changes  If you are running into difficulties it is very useful to see the changes
# Line 62  Getting updates from the repository</h2> Line 69  Getting updates from the repository</h2>
69  You can download and merge updates from the repository to bring you working  You can download and merge updates from the repository to bring you working
70  code up to date:  code up to date:
71  <blockquote>  <blockquote>
72  <pre>cvs update</pre>  <pre>cvs update -d -P</pre>
73  </blockquote>  </blockquote>
74  will work recursively on all files in the current directory and below.  will work recursively on all files in the current directory and below.
75  To update just a specific file or  To update just a specific file or
# Line 70  To update just a specific file or Line 77  To update just a specific file or
77  <blockquote>  <blockquote>
78  <pre>cvs update <i>file</i></pre>  <pre>cvs update <i>file</i></pre>
79  </blockquote>  </blockquote>
80    You can also update to a specific version, just as you could check out
81    a specific version.
82    <blockquote>
83    <pre>cvs update -d -P -r checkpoint40</pre>
84    </blockquote>
85    If you checked out a specific version and want to update to the very latest
86    use the -A option will remove associated with a specific version as follows:
87    <blockquote>
88    <pre>cvs update -d -P -A</pre>
89    </blockquote>
90  "cvs update" produces output to the terminal with the following meanings:  "cvs update" produces output to the terminal with the following meanings:
91  <br>&nbsp;  <br>&nbsp;
92  <table BORDER CELLPADDING=3 WIDTH="80%" NOSAVE >  <table BORDER CELLPADDING=3 WIDTH="80%" NOSAVE >
# Line 107  have changed <b>but</b> there is a confl Line 124  have changed <b>but</b> there is a confl
124  </tr>  </tr>
125  </table>  </table>
126    
127  <blockquote>&nbsp;</blockquote>  <p>When conflicts arise, the sections of code are both kept and surrounded
 When conflicts arise, the sections of code are both kept and surrounded  
128  by &lt;&lt;&lt;&lt;&lt;, ===== and >>>>> indicators. You need to  by &lt;&lt;&lt;&lt;&lt;, ===== and >>>>> indicators. You need to
129  <br>examine these lines of the files and resolve the conflict.  <br>examine these lines of the files and resolve the conflict.
130  <h2>  <h2>
# Line 125  Source Development With CVS"</a>. Line 141  Source Development With CVS"</a>.
141  <td NOSAVE>Last modified on $Date$</td>  <td NOSAVE>Last modified on $Date$</td>
142    
143  <td>  <td>
144  <div align=right>CVS: $Source$Revision: 1.1 $</div>  <div align=right>CVS:  /u/gcmpack/mitgcm.org/usingcvstoget.html,v
145    $Revision$</div>
146  </td>  </td>
147  </tr>  </tr>
148  </table>  </table>
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
  ViewVC Help
Powered by ViewVC 1.1.22