From owner-svn-doc-all@FreeBSD.ORG Sat May 19 16:55:28 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 221D81065672; Sat, 19 May 2012 16:55:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD8E8FC0C; Sat, 19 May 2012 16:55:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4JGtRDo033815; Sat, 19 May 2012 16:55:27 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4JGtRel033813; Sat, 19 May 2012 16:55:27 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201205191655.q4JGtRel033813@svn.freebsd.org> From: Glen Barber Date: Sat, 19 May 2012 16:55:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r38835 - head/en_US.ISO8859-1/articles/committers-guide X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2012 16:55:28 -0000 Author: gjb Date: Sat May 19 16:55:27 2012 New Revision: 38835 URL: http://svn.freebsd.org/changeset/doc/38835 Log: Update the committers-guide article to reflect the Documentation CVS->SVN conversion: - Remove references of 'dcvs' from the VCS Operations Guide - Fix the date the src tree was moved from CVS->SVN while here - Add the date the doc CVS->SVN conversion was officially complete - Add doc-specific notes to the Subversion primer - Document that, though the Subversion Primer is written with the src tree in mind, the underlying concepts are the same Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.sgml Sat May 19 14:27:48 2012 (r38834) +++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml Sat May 19 16:55:27 2012 (r38835) @@ -255,8 +255,10 @@ It is assumed that you are already familiar with the basic operation of the version control systems in use. Traditionally this was - CVS, but as of June 2008, Subversion is used for the src tree. - Subversion is covered in . + CVS. Subversion is used for the src tree as + of May 2008 and the doc/www tree as of May + 2012. Subversion is covered in . The &a.cvsadm; are the owners of the repository and are responsible for direct modification of it for the purposes of @@ -285,19 +287,15 @@ /home/pcvs, the ports repository - dcvs@ - regarding - /home/dcvs, the doc - repository - projcvs@ - regarding /home/projcvs, the third party projects repository - The &os; repositories are currently split into four distinct parts, - namely doc, ports, - projects and src. These are + The &os; repositories are currently split into two distinct parts, + namely ports and projects. + These are combined under a single CVSROOT when distributed via CVSup for the convenience of our users. The src tree is automatically exported to @@ -307,11 +305,6 @@ CVS but in Subversion. The official and exported trees are not necessarily equal. - Note that the sources for the - FreeBSD website are - contained within the www module of the - doc repository. - The CVS repositories are hosted on the repository machines. Currently, each of the repositories above reside on the same physical machine, ncvs.FreeBSD.org, but to allow for @@ -334,12 +327,6 @@ - doc - dcvs.FreeBSD.org - /home/dcvs - - - ports pcvs.FreeBSD.org /home/pcvs @@ -365,8 +352,7 @@ user may add the following to their .cshrc for this purpose: - alias dcvs cvs -d user@dcvs.FreeBSD.org:/home/dcvs -alias pcvs cvs -d user@pcvs.FreeBSD.org:/home/pcvs + alias pcvs cvs -d user@pcvs.FreeBSD.org:/home/pcvs alias projcvs cvs -d user@projcvs.FreeBSD.org:/home/projcvs This way they can do all CVS operations @@ -1029,11 +1015,9 @@ checkout -P ssh connection to the repository machine. First, put this configuration into your ~/.ssh/config: - Host dcvs.FreeBSD.org + Host pcvs.FreeBSD.org ControlPath /home/user/.ssh/cvs.cpath Host projcvs.FreeBSD.org - ControlPath /home/user/.ssh/cvs.cpath -Host pcvs.FreeBSD.org ControlPath /home/user/.ssh/cvs.cpath Now open the persistent connection to the repoman: @@ -1061,6 +1045,22 @@ Host pcvs.FreeBSD.org first real SVN commit is r179447. + The &os; doc/www repository switched + from CVS to Subversion on May 19th, 2012. + The first real SVN commit is + r38821. + + + Part of the doc/www + CVS to SVN conversion + included an infrastructural change to the build process. + The most notable change is the location of the + &os; website www tree, which has + been moved from + www/lang/ to + head/lang/htdocs/. + + There are mechanisms in place to automatically merge changes back from the Subversion repository to the CVS one, so regular users should not notice @@ -1124,10 +1124,23 @@ Host pcvs.FreeBSD.org Direct Checkout The first is to check out directly from the main - repository: + repository. For the src tree, + use: &prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src + For the doc tree, use: + + &prompt.user; svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc + + + Though the remaining examples in this document are + written with the workflow of working with the + src tree in mind, the underlying + concepts are the same for working with the + doc tree. + + The above command will check out a CURRENT source tree as /usr/src/,