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 @@ - Selecting the Source and Target + Selecting the Source and Target for stable/10 and + newer. + + 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: + + &prompt.user; svn merge -c r123456 ^/head/ checkout +&prompt.user; svn commit checkout + + Note that checkout should + be a complete checkout of the branch to which the merge + occurs. + + + + + + Selecting the Source and Target for stable/9 and + older. Because of mergeinfo propagation, it is important to choose the source and target for the merge carefully to