From d558fc6c47592f1f053aa097de934bdf1d7287ad Mon Sep 17 00:00:00 2001 From: Alexander Langer Date: Thu, 24 Oct 2002 18:54:17 +0000 Subject: [PATCH] ncvs.FreeBSD.org is now the main repository host. Describe how to commit on ncvs.FreeBSD.org using remote CVS. Add a note to NOT use the main repository host as your personal cvs server, as inspired by peter's mail to developers@ a while back. Refer to the cvsup distribution method and cvsup-master instead and give an example of an "fcvs" alias, as suggested by many committers. Reword or remove various paragraphs about not modifiying the repository yourself, which is no longer possible, since only repomeisters have access to ncvs.FreeBSD.org. Remove the paragraph about CVSUMASK, which no longer applies. --- .../articles/committers-guide/article.sgml | 95 +++++++++++-------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 4f349400a1..e7879c9713 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -50,17 +50,19 @@ Main Repository Host - freefall.FreeBSD.org + ncvs.FreeBSD.org Login Methods - &man.ssh.1; + &man.ssh.1;, protocol 2 only Main CVSROOT - /home/ncvs + + ncvs.FreeBSD.org:/home/ncvs + @@ -83,8 +85,9 @@ It is required that you use &man.ssh.1; or &man.telnet.1; - with Kerberos 5 to connect to the repository hosts. These are - generally more secure than plain &man.telnet.1; or + with Kerberos 5 to connect to the project hosts and only + &man.ssh.1;, protocol 2 is allowed connecting to the repository + host. These are generally more secure than plain &man.telnet.1; or &man.rlogin.1; since credential negotiation will always be encrypted. All traffic is encrypted by default with &man.ssh.1;. With utilities like &man.ssh-agent.1; and &man.scp.1; also @@ -160,47 +163,57 @@ It is assumed that you are already familiar with the basic operation of CVS. - The &a.cvs; + The CVS repository is hosted on the repository machines. The &a.cvs; are the owners of the CVS repository and are - responsible for any and all direct - modification of it for the purposes of cleanup or fixing some - grievous abuse of CVS by a committer. No one else should - attempt to touch the repository directly. Should you cause some - repository accident, say a bad cvs import or cvs tag operation, do - not attempt to fix it yourself! - Mail the &a.cvs; (or call one of them) and report the problem to - one of them instead. The only ones allowed to directly fiddle - the repository bits are the repomeisters. + 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 cvs import or cvs tag 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. + There are no login shells on + ncvs.FreeBSD.org installed, except + for the repomeisters. - CVS operations are usually done by logging into - freefall, making sure the - CVSROOT environment variable is set to - /home/ncvs, and then doing the appropriate + CVS operations are done remotely by setting the + CVSROOT environment variable to + ncvs.FreeBSD.org:/home/ncvs + and the CVS_RSH variable to + ssh + and then doing the appropriate check-out/check-in operations. If you wish to add something which is wholly new (like contrib-ified sources, etc), cvs import should be used. Refer to the &man.cvs.1; manual page for usage. - Note that when you use CVS on freefall, you - should set your umask to 2, - as well as setting the CVSUMASK environment - variable to 2. This ensures that any new - files created by cvs add will have the correct - permissions. If you add a file or directory and discover that the - file in the repository has incorrect permissions (specifically, - all files in the repository should be group writable by group - ncvs), contact one of the repository meisters - as described below. + + Please do not use + cvs checkout or + update with the official repository machine set + as the CVS Root for keeping your source tree up to date. + Remote CVS is not optimized for network distribution + and requires a big work/administrative overhead on the server side. + Please use our advanced cvsup distribution + method for obtaining the repository bits, and only do the actual + commit operation on the repository host. + We provide an extensive cvsup replication network for this purpose, + as well as give access to cvsup-master if you + really need to stay current to the latest changes. + cvsup-master has got the horsepower to deal with + this, the repository master server does not. &a.jdp; is in + charge of cvsup-master. + + + Many committers define an alias fcvs + which aliases to + cvs -d + xxx@ncvs.FreeBSD.org:/home/ncvs + for this purpose. That way they do all CVS operations + locally and use fcvs commit for committing + to the official CVS tree. + - If you are familiar with remote CVS and consider yourself - pretty studly with CVS in general, you can also do CVS - operations directly from your own machine and local working - sources. Just remember to set CVS_RSH to - ssh so that you are using a relatively - secure and reliable transport. If you have no idea what any of - the above even means, on the other hand, then please stick with - logging into freefall and applying your diffs - with &man.patch.1;. If you need to use CVS add and delete operations in a manner that is @@ -579,11 +592,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.140 2002-10-24 18:54:17 alex 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.139 2002-10-14 23:18:35 jdp Exp $ line, leaving the original - $Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $ line intact). + the second $Id: article.sgml,v 1.140 2002-10-24 18:54:17 alex Exp $ line, leaving the original + $Id: article.sgml,v 1.140 2002-10-24 18:54:17 alex Exp $ line intact).