os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Committer guide: further remove merge information older branches

Browse source 
There are no such supported branches. Those that need to merge to such
branches can get the information from the documentation archive.

While here, remove an incorrect note that depth cannnot be reduced
(it can be).
This commit is contained in:
Eitan Adler 2018-06-16 20:10:41 +00:00
parent d76fb37855
commit 62ddfba6e2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=51849
1 changed files with 2 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

46
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

@ -35,6 +35,7 @@
<year>2015</year>
<year>2016</year>
<year>2017</year>
<year>2018</year>
<holder>The &os; Documentation Project</holder>
</copyright>
@ -818,11 +819,6 @@ You need a Passphrase to protect your secret key.</screen>
case, <literal>head</literal> and
<literal>stable/7</literal>; it will not pull down the whole
tree.</para>
<note>
<para>Decreasing the depth of a working copy is not
possible.</para>
</note>
</sect3>
<sect3 xml:id="svn-daily-use-anonymous-checkout">
@ -1266,13 +1262,6 @@ You need a Passphrase to protect your secret key.</screen>
<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>
@ -1288,14 +1277,8 @@ You need a Passphrase to protect your secret key.</screen>
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>
<para>Starting with the <literal>stable/10</literal>
branch, all merges are
<para>All merges are
merged to and committed from the root of the
branch. All merges look like:</para>
@ -1306,10 +1289,6 @@ You need a Passphrase to protect your secret key.</screen>
a complete checkout of the branch to which the merge
occurs.</para>
<para>Merges to <literal>releng/</literal> branches must
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>
@ -1436,27 +1415,6 @@ U stable/9/share/man/man4/netmap.4
<screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>
</sect5>
<sect5>
<title>Merging into the Kernel
(<filename>sys/</filename>)</title>
<para>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
(<filename>sys/</filename>).</para>
<para>Once <command>svn merge</command> has been executed,
<command>svn diff</command> 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 <quote>Merge
<replaceable>r226222</replaceable> from head</quote>,
or similar.</para>
</sect5>
</sect4>
<sect4>