aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/articles/committers-guide
diff options
context:
space:
mode:
authorRemko Lodder <remko@FreeBSD.org>2006-08-19 17:26:24 +0000
committerRemko Lodder <remko@FreeBSD.org>2006-08-19 17:26:24 +0000
commit33397af6bbb66c8a496fb2a399281467cda7221a (patch)
treeaf5e4eec134dbbc43dfd6dcf7c8a056813a81afd /en_US.ISO8859-1/articles/committers-guide
parentdcd62a2aeb6f45e6ac48d58cd6abeb2aaee60445 (diff)
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.sgml16
1 files changed, 8 insertions, 8 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index d800ed962b..3b3f0ff82b 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -315,17 +315,17 @@
<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
+ and
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
-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>
+ <programlisting>alias dcvs cvs -d <replaceable>user</replaceable>@dcvs.FreeBSD.org:/home/dcvs
+alias pcvs cvs -d <replaceable>user</replaceable>@pcvs.FreeBSD.org:/home/pcvs
+alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/projcvs
+alias scvs 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
@@ -729,11 +729,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.244 2006-07-22 00:31:01 obrien Exp $</literal> (or in FreeBSD's case,
+ of the <literal>$Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko 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.244 2006-07-22 00:31:01 obrien Exp $</literal> line,
- leaving the original <literal>$Id: article.sgml,v 1.244 2006-07-22 00:31:01 obrien Exp $</literal> line intact).</para>
+ (remove the marker lines and the second <literal>$Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko Exp $</literal> line,
+ leaving the original <literal>$Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko Exp $</literal> line intact).</para>
</listitem>
<listitem>