From owner-svn-doc-user@FreeBSD.ORG Fri Feb 14 22:31:15 2014 Return-Path: Delivered-To: svn-doc-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 171013DE; Fri, 14 Feb 2014 22:31:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC76D1D93; Fri, 14 Feb 2014 22:31:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EMVEPw069505; Fri, 14 Feb 2014 22:31:14 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EMVEdJ069504; Fri, 14 Feb 2014 22:31:14 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402142231.s1EMVEdJ069504@svn.freebsd.org> From: Glen Barber Date: Fri, 14 Feb 2014 22:31:14 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r43941 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng X-SVN-Group: doc-user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc experimental trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 22:31:15 -0000 Author: gjb Date: Fri Feb 14 22:31:14 2014 New Revision: 43941 URL: http://svnweb.freebsd.org/changeset/doc/43941 Log: Consolidate the 'code slush' and 'code freeze' into its own section. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:12 2014 (r43940) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:14 2014 (r43941) @@ -80,6 +80,15 @@ + + + + General information about the code + slush and code freeze. + + + + @@ -217,15 +226,18 @@ branch. - + Release from <literal>head/</literal> - This section describes the general procedures of the - &os; release cycle from the head/ - branch. + This section describes the general procedures related + to the code slush and code freeze + during the &os; release cycle. + + This applies to both head/ and + stable/ branches. - - Code Slush in <literal>head/</literal> + + The Code Slush Approximately one month prior to the scheduled code slush, the &team.re; sends a reminder @@ -239,11 +251,43 @@ branch. - - Code Freeze in <literal>head/</literal> + + The Code Freeze -   + Approximately one week prior to the scheduled + code freeze, the &team.re; sends a reminder + email to the &os; Developers. + + The code freeze marks the point in time where all commits + to the branch require explicit approval from the + &team.re;. + + The &os; Subversion repository + contains several hooks to perform sanity checks before any + commit is actually committed to the tree. One of these hooks + will evaluate if committing to a particular branch requires + specific approval. + + To enforce commit approvals by the &team.re;, the Release + Engineer updates + base/svnadmin/conf/approvers, and commits + the change back to the repository. Once this is done, any + change to the branch must include an Approved + by: line in the commit message. + + The Approved by: line must match the second + column in base/svnadmin/conf/approvers, + otherwise the commit will be rejected by the repository + hooks. + + + + Release from <literal>head/</literal> + + This section describes the general procedures of the + &os; release cycle from the head/ + branch. &os; <quote><literal>ALPHA</literal></quote> @@ -281,36 +325,6 @@ &os; release cycle from an extablished <literal>stable/</literal> branch.</para> - <sect2 xml:id="releng-stable-slush"> - <title>Code Slush in <literal>head/</literal> - - - If the release is being created from - head/, this section can be skipped - because the code slush would have already been in effect. - Instead, continue with . - - -   - - - - Code Freeze in the - <literal>stable/<replaceable>N/</replaceable></literal> - Branch - - - If the release is being created from - head/, this section can be skipped - because the code freeze would have already been in effect. - Instead, continue with . - - -   - - &os; <literal>-BETA</literal> Builds