Date: Wed, 22 Aug 2012 14:55:20 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39417 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201208221455.q7MEtKcM047762@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Aug 22 14:55:20 2012 New Revision: 39417 URL: http://svn.freebsd.org/changeset/doc/39417 Log: Add a more concrete example on how to do a MFC. Approved by: joel (mentor) Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.sgml Tue Aug 21 19:16:02 2012 (r39416) +++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml Wed Aug 22 14:55:20 2012 (r39417) @@ -575,7 +575,7 @@ preferable.</para> </sect3> - <sect3> + <sect3 id="subversion-primer-base-layout"> <title><literal>RELENG_*</literal> Branches and General Layout</title> @@ -1151,7 +1151,7 @@ &prompt.user; <userinput>svn commit stable/8</userinput></screen> </sect3> - <sect3> + <sect3 id="subversion-primer-merge"> <title>Merging with <acronym>SVN</acronym></title> <para>This section deals with merging code from one branch to @@ -1442,6 +1442,38 @@ $target - head/$source:$P,$Q,$R</screen> </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> <title>Merging into the Kernel (<filename class="directory">sys/</filename>)</title>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208221455.q7MEtKcM047762>