From owner-freebsd-doc@FreeBSD.ORG Mon Sep 3 20:30:09 2012 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C5161065674 for ; Mon, 3 Sep 2012 20:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 527A98FC19 for ; Mon, 3 Sep 2012 20:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q83KU9gG044518 for ; Mon, 3 Sep 2012 20:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q83KU9mP044499; Mon, 3 Sep 2012 20:30:09 GMT (envelope-from gnats) Resent-Date: Mon, 3 Sep 2012 20:30:09 GMT Resent-Message-Id: <201209032030.q83KU9mP044499@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lowell Gilbert Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 017601065670 for ; Mon, 3 Sep 2012 20:23:26 +0000 (UTC) (envelope-from lowell@be-well.ilk.org) Received: from asbnvacz-mailrelay01.megapath.net (asbnvacz-mailrelay01.megapath.net [207.145.128.243]) by mx1.freebsd.org (Postfix) with ESMTP id B59AF8FC14 for ; Mon, 3 Sep 2012 20:23:25 +0000 (UTC) Received: from mail5.sea5.speakeasy.net (mail5.sea5.speakeasy.net [69.17.117.49]) by asbnvacz-mailrelay01.megapath.net (Postfix) with ESMTP id 3A622A710AC for ; Mon, 3 Sep 2012 16:23:24 -0400 (EDT) Received: (qmail 8692 invoked from network); 3 Sep 2012 20:23:23 -0000 Received: by simscan 1.4.0 ppid: 16580, pid: 11792, t: 3.4595s scanners: clamav: 0.88.2/m:52/d:10739 Received: from unknown (HELO be-well.ilk.org) ([66.92.78.145]) (envelope-sender ) by mail5.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 3 Sep 2012 20:23:20 -0000 Received: from lowell-desk.lan (lowell-desk.lan [172.30.250.8]) by be-well.ilk.org (Postfix) with ESMTP id 330FA33C23 for ; Mon, 3 Sep 2012 16:23:06 -0400 (EDT) Received: by lowell-desk.lan (Postfix, from userid 1147) id 9E6573983C; Mon, 3 Sep 2012 16:23:06 -0400 (EDT) Message-Id: <20120903202306.9E6573983C@lowell-desk.lan> Date: Mon, 3 Sep 2012 16:23:06 -0400 (EDT) From: Lowell Gilbert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: docs/171292: [PATCH] handbook should describe subversion for src in preference to CVS X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 20:30:09 -0000 >Number: 171292 >Category: docs >Synopsis: [PATCH] handbook should describe subversion for src in preference to CVS >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Mon Sep 03 20:30:08 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Lowell Gilbert >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: FreeBSD Users >Environment: System: FreeBSD lowell-desk.lan 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #21: Fri Aug 31 22:35:59 EDT 2012 root@lowell-desk.lan:/usr/obj/usr/src/sys/LOWELL64 amd64 >Description: The Handbook still describes updating sources through CVS, but Subversion is replacing it as the 9.1 branch will not be exported to CVS. >How-To-Repeat: See "cutting edge" section of Handbook. >Fix: This is, at the least, a start... Index: en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml =================================================================== --- en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml (revision 39493) +++ en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml (working copy) @@ -118,6 +118,12 @@ the port net/cvsup-without-gui). You may wish to substitute this with &man.csup.1;, which is part of the base system. + The use of cvsup is slowly being + obsoleted as subversion replaces the use + of cvs for the project's underlying + version control structure. New installations are discouraged + from using cvsup/csup, + and encouraged to use svn instead. @@ -1376,35 +1382,26 @@ - Use the cvsup program - with the supfile named - standard-supfile - available from - /usr/share/examples/cvsup. + Use the Subversion program. This is the most recommended method, since it allows you to grab the entire collection once and then only what has changed from then on. Many people run - cvsup from cron and - keep their sources up-to-date automatically. You have to - customize the sample supfile above, - and configure cvsup for your environment. - + subversion from cron and + keep their sources up-to-date automatically. - The sample standard-supfile is - intended for tracking a specific security branch of - &os;, and not &os.current;. You will need to edit this - file and replace the following line: + There is no version-control "tag" for the + &os.current; branch of &os;. + The command line for + using subversion to retrieve + &os.current; is + &prompt.root; svn checkout svn://svn.FreeBSD.org/base/head /usr/src - *default release=cvs tag=RELENG_X_Y - - With this one: - - *default release=cvs tag=. - - For a detailed explanation of usable tags, please + Similar procedures apply for other development + branches and tags: for a detailed explanation of usable tags, please refer to the Handbook's CVS Tags section. + linkend="cvs-tags">CVS Tags section, + which is still roughly appropriate + for Subversion. @@ -1567,10 +1564,13 @@ If you are already running a previous release of &os; and wish to upgrade via sources then you can easily do so from &os; mirror site. This can - be done in one of two ways: + be done in one of several ways: + subversion + + cvsup @@ -1581,11 +1581,31 @@ syncing with CVSup + Use the subversion program + with the appropriate &os.stable; tag for the + sources on the branch you prefer. + This is the most recommended method, since it allows you to + grab the entire collection once and then only what has + changed from then on. Many people run the + subversion from cron to + keep their sources up-to-date automatically. + The command line for + using subversion to + retrieve &os.stable; is + &prompt.root; svn checkout svn://svn.FreeBSD.org/base/stable/9 /usr/src + as long as 9.x is the &os.stable; branch. + + + + Use the cvsup program with the supfile named stable-supfile from the directory /usr/share/examples/cvsup. - This is the most recommended method, since it allows you to + This method is becoming obsolescent, but is still + appropriate for &os; versions before + 9.1. Like subversion, it allows + you to grab the entire collection once and then only what has changed from then on. Many people run cvsup from cron to >Release-Note: >Audit-Trail: >Unformatted: