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

Update the merging chapter and explain the new merging policy.

Browse source 
Reviewed by:	peter
This commit is contained in:
Eitan Adler 2013-12-07 23:00:33 +00:00
parent 9f9b300907
commit 0ab43263c7
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=43291
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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