diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 5a561ab8a7..df65cc3dea 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -35,6 +35,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project @@ -818,11 +819,6 @@ You need a Passphrase to protect your secret key. case, head and stable/7; it will not pull down the whole tree. - - - Decreasing the depth of a working copy is not - possible. - @@ -1266,13 +1262,6 @@ You need a Passphrase to protect your secret key. &prompt.user; svn merge -c r123456 ^/head/ stable/11 &prompt.user; svn commit stable/11 - - Note the sections below which outline changes to - the target location of the stable/ - branch starting with - stable/10. - - Merges to releng/ branches should always originate from the corresponding stable/ branch. For example: @@ -1288,14 +1277,8 @@ You need a Passphrase to protect your secret key. may commit to a releng/ branch for a Security Advisory or Errata Notice. - - - Selecting the Source and Target for - <literal>stable/10</literal> and Newer - - Starting with the stable/10 - branch, all merges are + All merges are merged to and committed from the root of the branch. All merges look like: @@ -1306,10 +1289,6 @@ You need a Passphrase to protect your secret key. a complete checkout of the branch to which the merge occurs. - Merges to releng/ branches must - always originate from the corresponding - stable/ branch. For example: - &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 @@ -1436,27 +1415,6 @@ U stable/9/share/man/man4/netmap.4 &prompt.user; svn commit stable/9/share/man/man4 - - - Merging into the Kernel - (<filename>sys/</filename>) - - As stated above, merging into the kernel is - different from merging in the rest of the tree. In many - ways merging to the kernel is simpler because there is - always the same merge target - (sys/). - - Once svn merge has been executed, - svn diff has to be run on the - directory to check the changes. This may show some - unrelated property changes, but these can be ignored. - Next, build and test the kernel, and, once the tests are - complete, commit the code as normal, making sure that - the commit message starts with Merge - r226222 from head, - or similar. -