From owner-svn-doc-head@FreeBSD.ORG Wed Aug 22 14:55:21 2012 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F966106564A; Wed, 22 Aug 2012 14:55:21 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 108F58FC08; Wed, 22 Aug 2012 14:55:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7MEtKRF047764; Wed, 22 Aug 2012 14:55:20 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7MEtKcM047762; Wed, 22 Aug 2012 14:55:20 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201208221455.q7MEtKcM047762@svn.freebsd.org> From: Niclas Zeising Date: Wed, 22 Aug 2012 14:55:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r39417 - head/en_US.ISO8859-1/articles/committers-guide X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2012 14:55:21 -0000 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. - + <literal>RELENG_*</literal> Branches and General Layout @@ -1151,7 +1151,7 @@ &prompt.user; svn commit stable/8 - + Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to @@ -1442,6 +1442,38 @@ $target - head/$source:$P,$Q,$R + Practical Example + As an practical example, consider the following scenario: + The changes to netmap.4 in r238987 is + to be merged from CURRENT to 9-STABLE. The file resides in + head/share/man/man4 and + according to 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 + . + The first step is to check the existing mergeinfo. + + &prompt.user; svn propget svn:mergeinfo -R stable/9/share/man/man4 + + Take a quick note of how it looks before moving on to the next + step; doing the actual merge: + + &prompt.user; svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4 +--- 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 + + 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. + + &prompt.user; svn commit stable/9/share/man/man4 + + + Merging into the Kernel (<filename class="directory">sys/</filename>)