os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Link to Karl Fogel's chapters on how to use CVS.

Browse source 
Submitted by:	joe
This commit is contained in:
Nik Clayton 2001-06-09 14:01:06 +00:00
parent 46f58558f2
commit ad13c1c330
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9580
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.69 2001/06/02 05:45:59 dd Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -155,7 +155,10 @@
<para>CVS reference information, tutorials, and FAQs can also be found at: <para>CVS reference information, tutorials, and FAQs can also be found at:
<ulink <ulink
url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para> url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>,
and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
useful.</para>
<para>&a.des; also supplied the following <quote>mini primer</quote> for <para>&a.des; also supplied the following <quote>mini primer</quote> for
CVS.</para> CVS.</para>
@ -516,11 +519,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>

13
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.69 2001/06/02 05:45:59 dd Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -155,7 +155,10 @@
<para>CVS reference information, tutorials, and FAQs can also be found at: <para>CVS reference information, tutorials, and FAQs can also be found at:
<ulink <ulink
url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para> url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>,
and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
useful.</para>
<para>&a.des; also supplied the following <quote>mini primer</quote> for <para>&a.des; also supplied the following <quote>mini primer</quote> for
CVS.</para> CVS.</para>
@ -516,11 +519,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>