There's no such thing like the src-sys repository.

This commit is contained in:
Ruslan Ermilov 2004-09-03 20:37:55 +00:00
parent 9823929a37
commit 0b76bf495f
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=22230

View file

@ -227,8 +227,8 @@
<itemizedlist>
<listitem><para>ncvs@ - regarding <filename role="directory">
/home/ncvs</filename>, the src and
src-sys repository</para></listitem>
/home/ncvs</filename>, the src
repository</para></listitem>
<listitem><para>pcvs@ - regarding <filename role="directory">
/home/pcvs</filename>, the ports
@ -720,11 +720,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.208 2004-09-03 16:37:17 josef Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.208 2004-09-03 16:37:17 josef Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.208 2004-09-03 16:37:17 josef Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> line intact).</para>
</listitem>
<listitem>