diff options
author | Glen Barber <gjb@FreeBSD.org> | 2017-01-06 22:28:56 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2017-01-06 22:28:56 +0000 |
commit | 0eb12ab8a95c90b119ca78755951362acb0d719d (patch) | |
tree | 1cd762030b36a65903116979aa4092978dc166b9 /en_US.ISO8859-1/articles/committers-guide | |
parent | a25efe9394c17d1eeb8b02d05468da6c89fba295 (diff) |
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
-rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.xml | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 4f883feba4..5550319619 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -33,6 +33,8 @@ <year>2013</year> <year>2014</year> <year>2015</year> + <year>2016</year> + <year>2017</year> <holder>The &os; Documentation Project</holder> </copyright> @@ -1255,6 +1257,41 @@ You need a Passphrase to protect your secret key.</screen> not been.</para> </sect4> + <sect4 xml:id="merge-source"> + <title>Selecting the Source and Target Branch + When Merging</title> + + <para>Merging to <literal>stable/</literal> branches should + originate from <literal>head/</literal>. For + example:</para> + + <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/head/ stable/<replaceable>11</replaceable> +&prompt.user; svn commit stable/<replaceable>11</replaceable></screen> + + <note> + <para>Note the sections below which outline changes to + the target location of the <literal>stable</literal> + branch starting with + <literal>stable/10</literal>.</para> + </note> + + <para>Merges to <literal>releng/</literal> branches should + always originate from the corresponding + <literal>stable/</literal> branch. For example:</para> + + <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>11</replaceable> releng/<replaceable>11.0</replaceable> +&prompt.user; svn commit releng/<replaceable>11.0</replaceable></screen> + + <note> + <para>Committers are only permitted to commit to the + <literal>releng</literal> branches during a release + cycle after receiving approval from the Release + Engineering Team, after which only the Security Officer + may commit to a <literal>releng</literal> branch for + a Security Advisory or Errata Notice.</para> + </note> + </sect4> + <sect4 xml:id="merge"> <title>Selecting the Source and Target for <literal>stable/10</literal> and Newer</title> @@ -1270,12 +1307,6 @@ You need a Passphrase to protect your secret key.</screen> <para>Note that <replaceable>checkout</replaceable> should be a complete checkout of the branch to which the merge occurs.</para> - - <para>Merges to <literal>releng/</literal> branches should - always originate from the corresponding - <literal>stable/</literal> branch. For example:</para> - - <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable></screen> </sect4> <sect4 xml:id="oldmerge"> |