11 |
|
|
12 |
--> |
--> |
13 |
<head> |
<head> |
14 |
<title>CVS--Concurrent Versions System v1.12.1.1: 10. Multiple developers</title> |
<title>CVS—Concurrent Versions System v1.12.1.1: 10. Multiple developers</title> |
15 |
|
|
16 |
<meta name="description" content="CVS--Concurrent Versions System v1.12.1.1: 10. Multiple developers"> |
<meta name="description" content="CVS—Concurrent Versions System v1.12.1.1: 10. Multiple developers"> |
17 |
<meta name="keywords" content="CVS--Concurrent Versions System v1.12.1.1: 10. Multiple developers"> |
<meta name="keywords" content="CVS—Concurrent Versions System v1.12.1.1: 10. Multiple developers"> |
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"> |
286 |
printed, and the resulting file includes both |
printed, and the resulting file includes both |
287 |
versions of the lines that overlap, delimited by |
versions of the lines that overlap, delimited by |
288 |
special markers. |
special markers. |
289 |
See section <a href="cvs_16.html#SEC153">update--Bring work tree in sync with repository</a>, for a complete description of the |
See section <a href="cvs_16.html#SEC153">update—Bring work tree in sync with repository</a>, for a complete description of the |
290 |
<code>update</code> command. |
<code>update</code> command. |
291 |
</p> |
</p> |
292 |
<hr size="6"> |
<hr size="6"> |
542 |
<p>Note that these locks are to protect <small>CVS</small>'s |
<p>Note that these locks are to protect <small>CVS</small>'s |
543 |
internal data structures and have no relationship to |
internal data structures and have no relationship to |
544 |
the word <em>lock</em> in the sense used by |
the word <em>lock</em> in the sense used by |
545 |
<small>RCS</small>--which refers to reserved checkouts |
<small>RCS</small>—which refers to reserved checkouts |
546 |
(see section <a href="#SEC83">Multiple developers</a>). |
(see section <a href="#SEC83">Multiple developers</a>). |
547 |
</p> |
</p> |
548 |
<p>Any number of people can be reading from a given |
<p>Any number of people can be reading from a given |
750 |
applying the <code>cvs unedit</code> command (described below) to the file |
applying the <code>cvs unedit</code> command (described below) to the file |
751 |
|
|
752 |
</li><li> |
</li><li> |
753 |
applying the <code>cvs release</code> command (see section <a href="cvs_16.html#SEC149">release--Indicate that a Module is no longer in use</a>) to the file's parent directory |
applying the <code>cvs release</code> command (see section <a href="cvs_16.html#SEC149">release—Indicate that a Module is no longer in use</a>) to the file's parent directory |
754 |
(or recursively to a directory more than one level up) |
(or recursively to a directory more than one level up) |
755 |
|
|
756 |
</li><li> |
</li><li> |
909 |
<p>If watches are not in use, the <code>unedit</code> command |
<p>If watches are not in use, the <code>unedit</code> command |
910 |
probably does not work, and the way to revert to the |
probably does not work, and the way to revert to the |
911 |
repository version is with the command <code>cvs update -C file</code> |
repository version is with the command <code>cvs update -C file</code> |
912 |
(see section <a href="cvs_16.html#SEC153">update--Bring work tree in sync with repository</a>). |
(see section <a href="cvs_16.html#SEC153">update—Bring work tree in sync with repository</a>). |
913 |
The meaning is |
The meaning is |
914 |
not precisely the same; the latter may also |
not precisely the same; the latter may also |
915 |
bring in some changes which have been made in the |
bring in some changes which have been made in the |