diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index c4037975f7..8d6d6e6251 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -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