From owner-svn-doc-all@FreeBSD.ORG Wed Aug 22 21:18:17 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by hub.freebsd.org (Postfix) with ESMTP id 6A8721065673; Wed, 22 Aug 2012 21:18:17 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from opti.dougb.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 8308714DFBF; Wed, 22 Aug 2012 21:18:09 +0000 (UTC) Message-ID: <50354C91.5010302@FreeBSD.org> Date: Wed, 22 Aug 2012 14:18:09 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:14.0) Gecko/20120728 Thunderbird/14.0 MIME-Version: 1.0 To: Niclas Zeising References: <201208221455.q7MEtKcM047762@svn.freebsd.org> In-Reply-To: <201208221455.q7MEtKcM047762@svn.freebsd.org> X-Enigmail-Version: 1.4.3 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org Subject: Re: svn commit: r39417 - head/en_US.ISO8859-1/articles/committers-guide X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2012 21:18:17 -0000 It's great that we're giving people more examples, just a few thoughts ... On 08/22/2012 07:55, Niclas Zeising wrote: > + 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. Silly question, why? :) And if we're going to suggest this, we need to tell the user what they are looking for. Generally I find it's not necessary to inspect it first, see below. > + &prompt.user; svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4 First, I recommend cd'ing to the directory where the merge is to occur before doing anything else. Something like: cd stable/9/share/man/man4 svn up svn stat to make sure that you are up to date, and then run the merge. Also FYI, I'm pretty sure that 'merge -c' will choke on the r you have in the revision number there. My mfc function strips it, but I don't remember if that was for aesthetics, or because I got an error when I did it. > +--- 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. At this point I always do 'svn diff' to make sure that the change came through the way I expected it to. You will also see the mergeinfo diff here, even though it doesn't show up in the commit mail. hope this helps, Doug > + &prompt.user; svn commit stable/9/share/man/man4 If you are in the directory this can be simplified to 'svn ci' hth, Doug -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909)