11 |
|
|
12 |
--> |
--> |
13 |
<head> |
<head> |
14 |
<title>CVS--Concurrent Versions System v1.12.1.1: 1. Overview</title> |
<title>CVS—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—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—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"> |
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 "conflict" |
effort. But a more general definition of “conflict” |
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> |
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 "Added an optimization pass.", |
message. You type in “Added an optimization pass.”, |
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> |
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—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 |
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—Indicate that a Module is no longer in use</a>): |
531 |
</p> |
</p> |
532 |
<table><tr><td> </td><td><pre class="example">$ cd .. |
<table><tr><td> </td><td><pre class="example">$ cd .. |
533 |
$ cvs release -d tc |
$ cvs release -d tc |