From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 16:16:22 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 186B9106564A for ; Fri, 25 Feb 2011 16:16:22 +0000 (UTC) (envelope-from cliftonr@oz.volcano.org) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.125]) by mx1.freebsd.org (Postfix) with ESMTP id C81748FC0A for ; Fri, 25 Feb 2011 16:16:21 +0000 (UTC) Received: from hrndva-omtalb.mail.rr.com ([10.128.143.54]) by hrndva-qmta04.mail.rr.com with ESMTP id <20110225160216168.WWRX1970@hrndva-qmta04.mail.rr.com> for ; Fri, 25 Feb 2011 16:02:16 +0000 X-Authority-Analysis: v=1.1 cv=3uSaImBeuprzHBlOOPjkqgu+7PcxSRW0m2Aphm9Zmck= c=1 sm=0 a=DleubWtG9Z4A:10 a=kj9zAlcOel0A:10 a=G5OLwwqwWgs+1dCEPNHTSw==:17 a=jb__rZ8GAAAA:8 a=H9iEQFZ8AAAA:8 a=X4TAs1i4zfMnciT7P24A:9 a=Mbb4-zQqEkLPi3zx6OUSVtWfEMwA:4 a=CjuIK1q_8ugA:10 a=sHp_62vNEjwA:10 a=fZFZujrNNEQA:10 a=G5OLwwqwWgs+1dCEPNHTSw==:117 X-Cloudmark-Score: 0 X-Originating-IP: 75.80.196.236 Received: from [75.80.196.236] ([75.80.196.236:23750] helo=oz.volcano.org) by hrndva-oedge04.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id AD/1E-04612-542D76D4; Fri, 25 Feb 2011 16:01:10 +0000 Received: by oz.volcano.org (Postfix, from userid 1001) id 126C050824; Fri, 25 Feb 2011 06:01:09 -1000 (HST) Date: Fri, 25 Feb 2011 06:01:09 -1000 From: Clifton Royston To: freebsd-stable@freebsd.org Message-ID: <20110225160109.GA32260@lava.net> Mail-Followup-To: freebsd-stable@freebsd.org References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110225134225.GB19190@tolstoy.tols.org> User-Agent: Mutt/1.4.2.3i Subject: Re: 8.2/7.4-RELEASEs Announced... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 16:16:22 -0000 On Fri, Feb 25, 2011 at 02:42:25PM +0100, Marco van Tol wrote: > > Read up on the mergemaster manual for options "-F" and "-i" :-) freebsd-update does not use mergemaster, though probably it should. We had this discussion a month or two ago. Currently there is no way around verifying the changes for each file with a changed $ID$ field, frustrating as it is. (Also, if you realize you've made a mistake and say "N" at the end when it asks if all the merges are OK, it kicks you out of the update process instead of going through the merges again.) -- Clifton -- Clifton Royston -- cliftonr@iandicomputing.com / cliftonr@lava.net President - I and I Computing * http://www.iandicomputing.com/ Custom programming, network design, systems and network consulting services