/[texi2html]/texi2html/Tests/ccvs_res/cvs_1.html
ViewVC logotype

Diff of /texi2html/Tests/ccvs_res/cvs_1.html

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

revision 1.22 by pertusus, Tue Aug 9 17:19:21 2005 UTC revision 1.23 by pertusus, Tue Aug 23 23:51:10 2005 UTC
# Line 11  Send bugs and suggestions to <texi2html- Line 11  Send bugs and suggestions to <texi2html-
11    
12  -->  -->
13  <head>  <head>
14  <title>CVS--Concurrent Versions System v1.12.1.1: 1. Overview</title>  <title>CVS&mdash;Concurrent Versions System v1.12.1.1: 1. Overview</title>
15    
16  <meta name="description" content="CVS--Concurrent Versions System v1.12.1.1: 1. Overview">  <meta name="description" content="CVS&mdash;Concurrent Versions System v1.12.1.1: 1. Overview">
17  <meta name="keywords" content="CVS--Concurrent Versions System v1.12.1.1: 1. Overview">  <meta name="keywords" content="CVS&mdash;Concurrent Versions System v1.12.1.1: 1. Overview">
18  <meta name="resource-type" content="document">  <meta name="resource-type" content="document">
19  <meta name="distribution" content="global">  <meta name="distribution" content="global">
20  <meta name="Generator" content="texi2html">  <meta name="Generator" content="texi2html">
# Line 255  instrument plays itself or writes its ow Line 255  instrument plays itself or writes its ow
255  <dd>  <dd>
256  <p>When faced with conflicts within a single file, most  <p>When faced with conflicts within a single file, most
257  developers manage to resolve them without too much  developers manage to resolve them without too much
258  effort.  But a more general definition of &quot;conflict&quot;  effort.  But a more general definition of &ldquo;conflict&rdquo;
259  includes problems too difficult to solve without  includes problems too difficult to solve without
260  communication between developers.  communication between developers.
261  </p>  </p>
# Line 455  repository. Line 455  repository.
455  </pre></td></tr></table>  </pre></td></tr></table>
456    
457  <p><small>CVS</small> starts an editor, to allow you to enter a log  <p><small>CVS</small> starts an editor, to allow you to enter a log
458  message.  You type in &quot;Added an optimization pass.&quot;,  message.  You type in &ldquo;Added an optimization pass.&rdquo;,
459  save the temporary file, and exit the editor.  save the temporary file, and exit the editor.
460  </p>  </p>
461  <a name="IDX9"></a>  <a name="IDX9"></a>
# Line 484  of the file against the modification tim Line 484  of the file against the modification tim
484  had when it was last gotten or updated.  Therefore, if  had when it was last gotten or updated.  Therefore, if
485  a file's modification time has changed but its contents  a file's modification time has changed but its contents
486  have not, it will show up as modified.  The simplest  have not, it will show up as modified.  The simplest
487  way to handle this is simply not to worry about it--if  way to handle this is simply not to worry about it&mdash;if
488  you proceed with the commit <small>CVS</small> will detect that  you proceed with the commit <small>CVS</small> will detect that
489  the contents are not modified and treat it as an  the contents are not modified and treat it as an
490  unmodified file.  The next <code>update</code> will clue  unmodified file.  The next <code>update</code> will clue
# Line 527  tc.  One acceptable way to do that is of Line 527  tc.  One acceptable way to do that is of
527  $ rm -r tc  $ rm -r tc
528  </pre></td></tr></table>  </pre></td></tr></table>
529    
530  <p>but a better way is to use the <code>release</code> command (see section <a href="cvs_16.html#SEC149">release--Indicate that a Module is no longer in use</a>):  <p>but a better way is to use the <code>release</code> command (see section <a href="cvs_16.html#SEC149">release&mdash;Indicate that a Module is no longer in use</a>):
531  </p>  </p>
532  <table><tr><td>&nbsp;</td><td><pre class="example">$ cd ..  <table><tr><td>&nbsp;</td><td><pre class="example">$ cd ..
533  $ cvs release -d tc  $ cvs release -d tc

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26