From lowell@be-well.ilk.org  Mon Sep  3 20:23:26 2012
Return-Path: <lowell@be-well.ilk.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 017601065670
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <lowell@be-well.ilk.org>)
          by mail5.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <lgfbsd@be-well.ilk.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] handbook should describe subversion for src in preference to CVS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171292
>Category:       docs
>Synopsis:       [handbook] [patch] handbook should describe subversion for src in preference to CVS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 20:30:08 UTC 2012
>Closed-Date:    Mon Mar 11 21:14:54 UTC 2013
>Last-Modified:  Mon Mar 11 21:14:54 UTC 2013
>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 <filename>net/cvsup-without-gui</filename>).
 	You may wish to substitute this
 	with &man.csup.1;, which is part of the base system.</para>
+      <para>The use of <command>cvsup</command> is slowly being
+	obsoleted as <command>subversion</command> replaces the use
+	of <command>cvs</command> for the project's underlying
+	version control structure. New installations are discouraged
+	from using <command>cvsup</command>/<command>csup</command>,
+	and encouraged to use <command>svn</command> instead.</para>
     </note>
   </sect1>
 
@@ -1376,35 +1382,26 @@
 	      </indexterm>
 
 	      <listitem>
-		<para>Use the <link linkend="cvsup">cvsup</link> program
-		  with the <filename>supfile</filename> named
-		  <filename>standard-supfile</filename>
-		  available from
-		  <filename>/usr/share/examples/cvsup</filename>.
+		<para>Use the <application>Subversion</application> 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
-		  <command>cvsup</command> from <command>cron</command> and
-		  keep their sources up-to-date automatically.  You have to
-		  customize the sample <filename>supfile</filename> above,
-		  and configure <link
-		    linkend="cvsup">cvsup</link> for your environment.</para>
-
+		  <command>subversion</command> from <command>cron</command> and
+		  keep their sources up-to-date automatically.
 		<note>
-		  <para>The sample <filename>standard-supfile</filename> 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:</para>
+		  <para>There is no version-control "tag" for the
+		    &os.current; branch of &os;.
+		    The command line for
+		    using <command>subversion</command> to retrieve
+		    &os.current; is 
+		    <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/base/head</literal> <filename class="directory">/usr/src</filename></userinput></screen>
 
-		  <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
-
-		  <para>With this one:</para>
-
-		  <programlisting>*default release=cvs tag=.</programlisting>
-
-		  <para>For a detailed explanation of usable tags, please
+		  <para>Similar procedures apply for other development
+		    branches and tags: for a detailed explanation of usable tags, please
 		    refer to the Handbook's <link
-		      linkend="cvs-tags">CVS Tags</link> section.</para>
+		      linkend="cvs-tags">CVS Tags</link> section,
+		    which is still roughly appropriate
+		    for <application>Subversion</application>.</para>
 		</note>
 	      </listitem>
 
@@ -1567,10 +1564,13 @@
 	    <para>If you are already running a previous release of &os;
 	      and wish to upgrade via sources then you can easily do so
 	      from &os; <link linkend="mirrors">mirror site</link>.  This can
-	      be done in one of two ways:</para>
+	      be done in one of several ways:</para>
 
 	    <orderedlist>
 	      <indexterm>
+		<primary><command>subversion</command></primary>
+	      </indexterm>
+	      <indexterm>
 		<primary><command>cvsup</command></primary>
 	      </indexterm>
 	      <indexterm>
@@ -1581,11 +1581,31 @@
 		<secondary>syncing with <application>CVSup</application></secondary>
 	      </indexterm>
 	      <listitem>
+		<para>Use the <command>subversion</command> 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
+		  <command>subversion</command> from <command>cron</command> to
+		  keep their sources up-to-date automatically.
+		  The command line for
+		  using <command>subversion</command> to
+		  retrieve &os.stable; is
+		  <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/base/stable/9</literal> <filename class="directory">/usr/src</filename></userinput></screen>
+		  as long as 9.x is the &os.stable; branch.
+		</para>
+	      </listitem>
+
+	      <listitem>
 		<para>Use the <link linkend="cvsup">cvsup</link> program
 		  with the <filename>supfile</filename> named
 		  <filename>stable-supfile</filename> from the directory
 		  <filename>/usr/share/examples/cvsup</filename>.
-		  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 <command>subversion</command>, it allows
+		  you to
 		  grab the entire collection once and then only what has
 		  changed from then on.  Many people run
 		  <command>cvsup</command> from <command>cron</command> to
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->gjb 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Tue Sep 4 02:09:13 UTC 2012 
Responsible-Changed-Why:  
I want this.  This page is on my todo list for a while now. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=171292 

From: Eitan Adler <lists@eitanadler.com>
To: Lowell Gilbert <lgfbsd@be-well.ilk.org>
Cc: bug-followup@freebsd.org
Subject: Re: docs/171292: [PATCH] handbook should describe subversion for src
 in preference to CVS
Date: Tue, 4 Sep 2012 13:40:50 -0400

 On 3 September 2012 16:23, Lowell Gilbert <lgfbsd@be-well.ilk.org> wrote:
 >
 > The Handbook still describes updating sources through CVS, but Subversion is replacing it as the 9.1 branch will not be exported to CVS.
 
 please note that cvsup is NOT cvs and as of now, still supported and
 even recommended.
 
 
 
 -- 
 Eitan Adler

From: Lowell Gilbert <LGFBSD@Be-Well.Ilk.Org>
To: Eitan Adler <lists@eitanadler.com>
Cc: Lowell Gilbert <lgfbsd@be-well.ilk.org>,  bug-followup@freebsd.org
Subject: Re: docs/171292: [PATCH] handbook should describe subversion for src in preference to CVS
Date: Tue, 04 Sep 2012 14:56:59 -0400

 Eitan Adler <lists@eitanadler.com> writes:
 
 > On 3 September 2012 16:23, Lowell Gilbert <lgfbsd@be-well.ilk.org> wrote:
 >>
 >> The Handbook still describes updating sources through CVS, but Subversion is replacing it as the 9.1 branch will not be exported to CVS.
 >
 > please note that cvsup is NOT cvs and as of now, still supported and
 > even recommended.
 
 The announcement for the latest 9.1-PRERELEASE says otherwise,
 indicating that it and future release branches will not be exported
 to CVS, and thus will not be available through cvsup. That's why I wrote
 this documentation update. 
 

From: Eitan Adler <lists@eitanadler.com>
To: Lowell Gilbert <LGFBSD@be-well.ilk.org>
Cc: bug-followup@freebsd.org
Subject: Re: docs/171292: [PATCH] handbook should describe subversion for src
 in preference to CVS
Date: Tue, 4 Sep 2012 15:59:55 -0400

 On 4 September 2012 14:56, Lowell Gilbert <LGFBSD@be-well.ilk.org> wrote:
 > The announcement for the latest 9.1-PRERELEASE says otherwise,
 > indicating that it and future release branches will not be exported
 > to CVS, and thus will not be available through cvsup. That's why I wrote
 > this documentation update.
 
 I'm wrong once again: sorry for the noise, thanks for the patch!
 
 
 -- 
 Eitan Adler
Responsible-Changed-From-To: gjb->freebsd-docs 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Mon Sep 24 11:11:02 UTC 2012 
Responsible-Changed-Why:  
Back to the pool for now.  I have not had time to make proper progress 
on this. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=171292 
Responsible-Changed-From-To: freebsd-docs->freebsd-doc 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Mon Sep 24 11:14:08 UTC 2012 
Responsible-Changed-Why:  
Fix assignment. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=171292 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Mon Mar 11 21:14:53 UTC 2013 
State-Changed-Why:  
this has been committed over time in a different form 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171292 
>Unformatted:
