From owner-svn-doc-head@freebsd.org Fri Jan 6 22:28:57 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0793CA24A4; Fri, 6 Jan 2017 22:28:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B112A1BAC; Fri, 6 Jan 2017 22:28:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v06MSu4p022991; Fri, 6 Jan 2017 22:28:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06MSuEm022990; Fri, 6 Jan 2017 22:28:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201701062228.v06MSuEm022990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 6 Jan 2017 22:28:56 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r49800 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2017 22:28:58 -0000 Author: gjb Date: Fri Jan 6 22:28:56 2017 New Revision: 49800 URL: https://svnweb.freebsd.org/changeset/doc/49800 Log: Further clarify the source and target branches when merging. While here, bump the Copyright year. Submitted by: ngie Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Jan 6 20:02:33 2017 (r49799) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Jan 6 22:28:56 2017 (r49800) @@ -33,6 +33,8 @@ 2013 2014 2015 + 2016 + 2017 The &os; Documentation Project @@ -1255,6 +1257,41 @@ You need a Passphrase to protect your se not been. + + Selecting the Source and Target Branch + When Merging + + Merging to stable/ branches should + originate from head/. For + example: + + &prompt.user; svn merge -c r123456 ^/head/ stable/11 +&prompt.user; svn commit stable/11 + + + Note the sections below which outline changes to + the target location of the stable + branch starting with + stable/10. + + + Merges to releng/ branches should + always originate from the corresponding + stable/ branch. For example: + + &prompt.user; svn merge -c r123456 ^/stable/11 releng/11.0 +&prompt.user; svn commit releng/11.0 + + + Committers are only permitted to commit to the + releng branches during a release + cycle after receiving approval from the Release + Engineering Team, after which only the Security Officer + may commit to a releng branch for + a Security Advisory or Errata Notice. + + + Selecting the Source and Target for <literal>stable/10</literal> and Newer @@ -1270,12 +1307,6 @@ You need a Passphrase to protect your se Note that checkout should be a complete checkout of the branch to which the merge occurs. - - Merges to releng/ branches should - always originate from the corresponding - stable/ branch. For example: - - &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0