From owner-svn-doc-all@FreeBSD.ORG Mon Dec 9 15:37:30 2013 Return-Path: Delivered-To: svn-doc-all@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 E40551CA; Mon, 9 Dec 2013 15:37:30 +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 D00FF1445; Mon, 9 Dec 2013 15:37:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9FbU6X065096; Mon, 9 Dec 2013 15:37:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9FbU89065095; Mon, 9 Dec 2013 15:37:30 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091537.rB9FbU89065095@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 15:37:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43315 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 09 Dec 2013 15:37:31 -0000 Author: gjb Date: Mon Dec 9 15:37:30 2013 New Revision: 43315 URL: http://svnweb.freebsd.org/changeset/doc/43315 Log: Make it clear that merges to releng/N.M branches should originate from the corresponding stable/N branch. Reviewed by: gavin 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 Mon Dec 9 15:14:01 2013 (r43314) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 15:37:30 2013 (r43315) @@ -1133,6 +1133,12 @@ Note that checkout should be a complete checkout of the branch to which the merge occurs. + + Merges to releng/ branches should + always be merged from the corresponding + stable/ branch. For example: + + &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0