diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index ce699bdb78..a2491143e9 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $ line, - leaving the original $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $ line, + leaving the original $Id: article.sgml,v 1.241 2006-06-09 20:42:50 pav Exp $ line intact). @@ -1030,6 +1030,31 @@ checkout -P file before the commit, because CVS will not give you a chance to edit the message when you do the actual commit. + + + Speed up your CVS operation considerably by using a persistent + ssh connection to the repository machine. First, put this + configuration into your ~/.ssh/config: + + Host ncvs.FreeBSD.org + ControlPath /home/pav/.ssh/cvs.cpath +Host dcvs.FreeBSD.org + ControlPath /home/pav/.ssh/cvs.cpath +Host projcvs.FreeBSD.org + ControlPath /home/pav/.ssh/cvs.cpath +Host pcvs.FreeBSD.org + ControlPath /home/pav/.ssh/cvs.cpath + + Now open the persistent connection to the repoman: + + &prompt.user; ssh -fNM ncvs.FreeBSD.org + + The CVS commands should now respond faster, as they are reusing + existing connection with the repository. Note that all + the hostnames are case sensitive. + + +