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

Move the section on shell aliases together with the discussion on performing

Browse source 
CVS operations, where it fits slightly better.

Note to translators: I have tried to be sensitive to whitespace here, but it
has proved to be quite difficult in both this and the last revision.  Apologies
in advance.
This commit is contained in:
Ceri Davies 2003-07-13 16:09:56 +00:00
parent 97b2f24f05
commit f1217b46df
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17537
1 changed files with 19 additions and 20 deletions

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

@ -257,7 +257,22 @@
the <envar>CVS_RSH</envar> variable to
<command>ssh</command>,
and then doing the appropriate
check-out/check-in operations. If you wish to add
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
alias pcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@pcvs.freebsd.org:/home/pcvs
alias projcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@projcvs.freebsd.org:/home/projcvs
alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.org:/home/ncvs</programlisting>
<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
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>
@ -279,24 +294,8 @@
this, the repository master server does not. &a.jdp; is in
charge of <hostid>cvsup-master</hostid>.
</para>
<para>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
alias pcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@pcvs.freebsd.org:/home/pcvs
alias projcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@projcvs.freebsd.org:/home/projcvs
alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.org:/home/ncvs</programlisting>
<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.</para>
</note>
<para>If you need to use CVS <command>add</command> and
<command>delete</command> operations in a manner that is
effectively a &man.mv.1; operation, then a repository
@ -673,11 +672,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.169 2003-07-13 16:04:35 ceri Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.170 2003-07-13 16:09:56 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.169 2003-07-13 16:04:35 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.169 2003-07-13 16:04:35 ceri Exp $</literal> line intact).</para>
(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>
</listitem>
<listitem>