[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] Changes to texi2html/Tests/ccvs_res/cvs_5.html
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] Changes to texi2html/Tests/ccvs_res/cvs_5.html |
|
Date: |
Tue, 23 Aug 2005 19:51:27 -0400 |
Index: texi2html/Tests/ccvs_res/cvs_5.html
diff -u texi2html/Tests/ccvs_res/cvs_5.html:1.28
texi2html/Tests/ccvs_res/cvs_5.html:1.29
--- texi2html/Tests/ccvs_res/cvs_5.html:1.28 Tue Aug 9 17:19:22 2005
+++ texi2html/Tests/ccvs_res/cvs_5.html Tue Aug 23 23:51:13 2005
@@ -11,10 +11,10 @@
-->
<head>
-<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>
-<meta name="description" 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">
+<meta name="description" 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">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2html">
@@ -114,7 +114,7 @@
<p>Suppose that release 1.0 of tc has been made. You are continuing to
develop tc, planning to create release 1.1 in a couple of months. After a
while your customers start to complain about a fatal bug. You check
-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
(which turns out to have a trivial fix). However, the current revision
of the sources are in a state of flux and are not expected to be stable
for at least another month. There is no way to make a
@@ -173,7 +173,7 @@
<p><samp>`-r rel-1-0'</samp> says that this branch should be
rooted at the revision that
corresponds to the tag <samp>`rel-1-0'</samp>. It need not
-be the most recent revision - it's often useful to
+be the most recent revision – it's often useful to
split a branch off an old revision (for example, when
fixing a bug in a past release otherwise known to be
stable).
@@ -185,7 +185,7 @@
probably be different from file to file.
</p>
<p>So, the full effect of the command is to create a new
-branch - named <samp>`rel-1-0-patches'</samp> - in module
+branch – named <samp>`rel-1-0-patches'</samp> – in module
<samp>`tc'</samp>, rooted in the revision tree at the point tagged
by <samp>`rel-1-0'</samp>.
</p>
@@ -232,7 +232,7 @@
$ cvs update -r rel-1-0-patches
</pre></td></tr></table>
<p>It does not matter if the working copy was originally
-on the main trunk or on some other branch - the above
+on the main trunk or on some other branch – the above
command will switch it to the named branch. And
similarly to a regular <samp>`update'</samp> command,
<samp>`update -r'</samp> merges any changes you have made,
@@ -248,7 +248,7 @@
<p>To find out what branch a working copy is on, you can
use the <samp>`status'</samp> command. In its output, look for
the field named <samp>`Sticky tag'</samp> (see section <a
href="cvs_4.html#SEC53">Sticky tags</a>)
-- 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
any, of the current working files:
</p>
<table><tr><td> </td><td><pre class="example">$ cvs status -v driver.c
backend.c
@@ -465,7 +465,7 @@
newest revision on that branch into your working copy.
</p>
<a name="IDX121"></a>
-<p>The <samp>`-j'</samp> stands for "join".
+<p>The <samp>`-j'</samp> stands for “join”.
</p>
<a name="IDX122"></a>
<a name="IDX123"></a>