svn commit: r43291 - head/en_US.ISO8859-1/articles/committers-guide

[Eitan Adler]

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