11 |
|
|
12 |
--> |
--> |
13 |
<head> |
<head> |
14 |
<title>CVS--Concurrent Versions System v1.12.1.1: 5. Branching and merging</title> |
<title>CVS—Concurrent Versions System v1.12.1.1: 5. Branching and merging</title> |
15 |
|
|
16 |
<meta name="description" content="CVS--Concurrent Versions System v1.12.1.1: 5. Branching and merging"> |
<meta name="description" content="CVS—Concurrent Versions System v1.12.1.1: 5. Branching and merging"> |
17 |
<meta name="keywords" content="CVS--Concurrent Versions System v1.12.1.1: 5. Branching and merging"> |
<meta name="keywords" content="CVS—Concurrent Versions System v1.12.1.1: 5. Branching and merging"> |
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"> |
114 |
<p>Suppose that release 1.0 of tc has been made. You are continuing to |
<p>Suppose that release 1.0 of tc has been made. You are continuing to |
115 |
develop tc, planning to create release 1.1 in a couple of months. After a |
develop tc, planning to create release 1.1 in a couple of months. After a |
116 |
while your customers start to complain about a fatal bug. You check |
while your customers start to complain about a fatal bug. You check |
117 |
out release 1.0 (see section <a href="cvs_4.html#SEC48">Tags-Symbolic revisions</a>) and find the bug |
out release 1.0 (see section <a href="cvs_4.html#SEC48">Tags–Symbolic revisions</a>) and find the bug |
118 |
(which turns out to have a trivial fix). However, the current revision |
(which turns out to have a trivial fix). However, the current revision |
119 |
of the sources are in a state of flux and are not expected to be stable |
of the sources are in a state of flux and are not expected to be stable |
120 |
for at least another month. There is no way to make a |
for at least another month. There is no way to make a |
173 |
<p><samp>`-r rel-1-0'</samp> says that this branch should be |
<p><samp>`-r rel-1-0'</samp> says that this branch should be |
174 |
rooted at the revision that |
rooted at the revision that |
175 |
corresponds to the tag <samp>`rel-1-0'</samp>. It need not |
corresponds to the tag <samp>`rel-1-0'</samp>. It need not |
176 |
be the most recent revision - it's often useful to |
be the most recent revision – it's often useful to |
177 |
split a branch off an old revision (for example, when |
split a branch off an old revision (for example, when |
178 |
fixing a bug in a past release otherwise known to be |
fixing a bug in a past release otherwise known to be |
179 |
stable). |
stable). |
185 |
probably be different from file to file. |
probably be different from file to file. |
186 |
</p> |
</p> |
187 |
<p>So, the full effect of the command is to create a new |
<p>So, the full effect of the command is to create a new |
188 |
branch - named <samp>`rel-1-0-patches'</samp> - in module |
branch – named <samp>`rel-1-0-patches'</samp> – in module |
189 |
<samp>`tc'</samp>, rooted in the revision tree at the point tagged |
<samp>`tc'</samp>, rooted in the revision tree at the point tagged |
190 |
by <samp>`rel-1-0'</samp>. |
by <samp>`rel-1-0'</samp>. |
191 |
</p> |
</p> |
232 |
$ cvs update -r rel-1-0-patches |
$ cvs update -r rel-1-0-patches |
233 |
</pre></td></tr></table> |
</pre></td></tr></table> |
234 |
<p>It does not matter if the working copy was originally |
<p>It does not matter if the working copy was originally |
235 |
on the main trunk or on some other branch - the above |
on the main trunk or on some other branch – the above |
236 |
command will switch it to the named branch. And |
command will switch it to the named branch. And |
237 |
similarly to a regular <samp>`update'</samp> command, |
similarly to a regular <samp>`update'</samp> command, |
238 |
<samp>`update -r'</samp> merges any changes you have made, |
<samp>`update -r'</samp> merges any changes you have made, |
248 |
<p>To find out what branch a working copy is on, you can |
<p>To find out what branch a working copy is on, you can |
249 |
use the <samp>`status'</samp> command. In its output, look for |
use the <samp>`status'</samp> command. In its output, look for |
250 |
the field named <samp>`Sticky tag'</samp> (see section <a href="cvs_4.html#SEC53">Sticky tags</a>) |
the field named <samp>`Sticky tag'</samp> (see section <a href="cvs_4.html#SEC53">Sticky tags</a>) |
251 |
- that's <small>CVS</small>'s way of telling you the branch, if |
– that's <small>CVS</small>'s way of telling you the branch, if |
252 |
any, of the current working files: |
any, of the current working files: |
253 |
</p> |
</p> |
254 |
<table><tr><td> </td><td><pre class="example">$ cvs status -v driver.c backend.c |
<table><tr><td> </td><td><pre class="example">$ cvs status -v driver.c backend.c |
465 |
newest revision on that branch into your working copy. |
newest revision on that branch into your working copy. |
466 |
</p> |
</p> |
467 |
<a name="IDX121"></a> |
<a name="IDX121"></a> |
468 |
<p>The <samp>`-j'</samp> stands for "join". |
<p>The <samp>`-j'</samp> stands for “join”. |
469 |
</p> |
</p> |
470 |
<a name="IDX122"></a> |
<a name="IDX122"></a> |
471 |
<a name="IDX123"></a> |
<a name="IDX123"></a> |