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

Add a more concrete example on how to do a MFC.

Browse source 
Approved by:	joel (mentor)
This commit is contained in:
Niclas Zeising 2012-08-22 14:55:20 +00:00
parent ad00483077
commit 0f988a5254
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=39417
1 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -575,7 +575,7 @@
preferable.</para> preferable.</para>
</sect3> </sect3>
<sect3> <sect3 id="subversion-primer-base-layout">
<title><literal>RELENG_*</literal> Branches and General <title><literal>RELENG_*</literal> Branches and General
Layout</title> Layout</title>
@ -1151,7 +1151,7 @@
&prompt.user; <userinput>svn commit stable/8</userinput></screen> &prompt.user; <userinput>svn commit stable/8</userinput></screen>
</sect3> </sect3>
<sect3> <sect3 id="subversion-primer-merge">
<title>Merging with <acronym>SVN</acronym></title> <title>Merging with <acronym>SVN</acronym></title>
<para>This section deals with merging code from one branch to <para>This section deals with merging code from one branch to
@ -1441,6 +1441,38 @@ $target - head/$source:$P,$Q,$R</screen>
Subversion.</para> Subversion.</para>
</sect5> </sect5>
<sect5>
<title>Practical Example</title>
<para>As an practical example, consider the following scenario:
The changes to <filename>netmap.4</filename> in r238987 is
to be merged from CURRENT to 9-STABLE. The file resides in
<filename class="directory">head/share/man/man4</filename> and
according to <xref linkend="subversion-primer-merge"> this
is also where to do the merge. Note that in this example
all paths are relative to the top of the svn repository.
for more information on the directory layout, see
<xref linkend="subversion-primer-base-layout">.</para>
<para>The first step is to check the existing mergeinfo.</para>
<screen>&prompt.user; <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput></screen>
<para>Take a quick note of how it looks before moving on to the next
step; doing the actual merge:</para>
<screen>&prompt.user; <userinput>svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput>
--- Merging r238987 into 'stable/9/share/man/man4':
U stable/9/share/man/man4/netmap.4
--- Recording mergeinfo for merge of r238987 into
'stable/9/share/man/man4':
U stable/9/share/man/man4</screen>
<para>Check that the merge info is still ok; the revision
number of the merged revision should be added. Once this
is checked, the only thing left is the actual commit.</para>
<screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>
</sect5>
<sect5> <sect5>
<title>Merging into the Kernel <title>Merging into the Kernel
(<filename class="directory">sys/</filename>)</title> (<filename class="directory">sys/</filename>)</title>