From owner-svn-doc-all@FreeBSD.ORG  Sat Dec  7 23:00:34 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
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 7EBA6B38;
 Sat,  7 Dec 2013 23:00:34 +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 6AAC61028;
 Sat,  7 Dec 2013 23:00:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7N0Yrt067854;
 Sat, 7 Dec 2013 23:00:34 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7N0YnQ067853;
 Sat, 7 Dec 2013 23:00:34 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201312072300.rB7N0YnQ067853@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 7 Dec 2013 23:00:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43291 - 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 &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Dec 2013 23:00:34 -0000

Author: eadler
Date: Sat Dec  7 23:00:33 2013
New Revision: 43291
URL: http://svnweb.freebsd.org/changeset/doc/43291

Log:
  Update the merging chapter and explain the new merging policy.
  
  Reviewed by:	peter

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	Sat Dec  7 14:47:19 2013	(r43290)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Sat Dec  7 23:00:33 2013	(r43291)
@@ -1122,7 +1122,26 @@
 	</sect4>
 
 	<sect4>
-	  <title>Selecting the Source and Target</title>
+	  <title>Selecting the Source and Target for stable/10 and
+	    newer.</title>
+
+	  <para>Starting with the stable/10 branch all merges should be
+	    merged to and committed from the root of the
+	    branch.  All merges should look like:</para>
+
+	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/head/ <replaceable>checkout</replaceable>
+&prompt.user; svn commit <replaceable>checkout</replaceable></screen>
+
+	  <para>Note that <replaceable>checkout</replaceable> should
+	    be a complete checkout of the branch to which the merge
+	    occurs.</para>
+	</sect4>
+
+
+
+	<sect4>
+	  <title>Selecting the Source and Target for stable/9 and
+	    older.</title>
 
 	  <para>Because of mergeinfo propagation, it is important to
 	    choose the source and target for the merge carefully to