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

3 CVS Operations

Browse source 
- Add instructions on how to use persistent ssh connection to repoman

Clue provided by:	sat
This commit is contained in:
Pav Lucistnik 2006-06-09 20:42:50 +00:00
parent 8924a533f3
commit c44687baac
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28068
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.240 2006-06-02 20:50:17 scottl Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1030,6 +1030,31 @@ checkout -P</programlisting>
file before the commit, because CVS will not give you a chance to edit file before the commit, because CVS will not give you a chance to edit
the message when you do the actual commit.</para> the message when you do the actual commit.</para>
</listitem> </listitem>
<listitem>
<para>Speed up your CVS operation considerably by using a persistent
ssh connection to the repository machine. First, put this
configuration into your <filename>~/.ssh/config</filename>:</para>
<programlisting>Host ncvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
Host dcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
Host projcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
Host pcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath</programlisting>
<para>Now open the persistent connection to the repoman:</para>
<screen>&prompt.user; <userinput>ssh -fNM ncvs.FreeBSD.org</userinput></screen>
<para>The CVS commands should now respond faster, as they are reusing
existing connection with the repository. Note that all
the hostnames are case sensitive.</para>
</listitem>
</orderedlist> </orderedlist>
</sect1> </sect1>