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

Whitespace cleanup; translators please ignore.

Browse source
This commit is contained in:
Ceri Davies 2003-07-13 16:15:52 +00:00
parent f1217b46df
commit 6ddad465a9
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17538
1 changed files with 17 additions and 24 deletions

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

@ -179,18 +179,15 @@
<para>It is assumed that you are already familiar with the basic operation
of CVS.</para>
<para>The &a.cvs;
are the <quote>owners</quote> of the CVS repository and are
responsible for direct modification of it for the purposes of
<para>The &a.cvs; are the <quote>owners</quote> of the CVS repository and
are responsible for direct modification of it for the purposes of
cleanup or fixing some grievous abuse of CVS by a committer.
Should you cause some
repository accident, say a bad <command>cvs import</command> or <command>cvs tag</command>
operation, mail the &a.cvs; (or call one of them) and report the problem to
one of them. The only ones able to directly fiddle
the repository bits on the repository hosts are the repomeisters.
To enforce this, there are no login shells available on
the repository machines, except
to the repomeisters.</para>
Should you cause some repository accident, say a bad <command>cvs
import</command> or <command>cvs tag</command> operation, mail the &a.cvs;
(or call one of them) and report the problem to one of them. The only
ones able to directly fiddle the repository bits on the repository hosts
are the repomeisters. To enforce this, there are no login shells
available on the repository machines, except to the repomeisters.</para>
<para>The CVS tree is currently split into four distinct repositories,
namely <literal>doc</literal>, <literal>ports</literal>,
@ -254,14 +251,11 @@
<envar>CVSROOT</envar> environment variable to the appropriate host
and top-level directory (for example,
<hostid role="fqdn">ncvs.FreeBSD.org</hostid><literal>:</literal><filename>/home/ncvs</filename>),
the <envar>CVS_RSH</envar> variable to
<command>ssh</command>,
and then doing the appropriate
check-out/check-in operations.
Many committers define aliases
which expand to the correct <application>cvs</application> invocation
for the appropriate repository. For example, a &man.tcsh.1; user may
add the following to their <filename>.cshrc</filename> for this
the <envar>CVS_RSH</envar> variable to <command>ssh</command>, and then
doing the appropriate check-out/check-in operations. Many committers
define aliases which expand to the correct <application>cvs</application>
invocation for the appropriate repository. For example, a &man.tcsh.1;
user may add the following to their <filename>.cshrc</filename> for this
purpose:</para>
<programlisting>alias dcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@dcvs.freebsd.org:/home/dcvs
@ -271,8 +265,7 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
<para>This way they can do all CVS operations
locally and use <command><replaceable>X</replaceable>cvs commit</command> for committing
to the official CVS tree.
If you wish to add
to the official CVS tree. If you wish to add
something which is wholly new (like contrib-ified
sources, etc), <command>cvs import</command> should be used.
Refer to the &man.cvs.1; manual page for usage.</para>
@ -672,11 +665,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.170 2003-07-13 16:09:56 ceri Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.171 2003-07-13 16:15:52 ceri 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.170 2003-07-13 16:09:56 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.170 2003-07-13 16:09:56 ceri Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.171 2003-07-13 16:15:52 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.171 2003-07-13 16:15:52 ceri Exp $</literal> line intact).</para>
</listitem>
<listitem>