From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 20:02:19 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 483BA1065694 for ; Fri, 25 Feb 2011 20:02:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 1B9E18FC17 for ; Fri, 25 Feb 2011 20:02:19 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id B474646B1A; Fri, 25 Feb 2011 15:02:18 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 526218A027; Fri, 25 Feb 2011 15:02:18 -0500 (EST) From: John Baldwin To: freebsd-stable@freebsd.org Date: Fri, 25 Feb 2011 15:01:11 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <4D66CCFF.9020903@buffalo.edu> <20110225160109.GA32260@lava.net> <20110225180019.GD76063@eggman.experts-exchange.com> In-Reply-To: <20110225180019.GD76063@eggman.experts-exchange.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102251501.11318.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 25 Feb 2011 15:02:18 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean Cc: jhelfman@e-e.com 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 20:02:19 -0000 On Friday, February 25, 2011 1:00:19 pm jhelfman@e-e.com wrote: > > 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. > > My understanding is that freebsd-update was introduced prior to releases > being branched, so this issue surfaced at that time. The patch I believe > would be a fix to the freebsd-update client to better handle the tag. I > can't see mergemaster as being an easier solution, as the actual binary > would need to be verified against a known good index that would exist on the > update server. No, release branches long pre-date freebsd-update. However, before we switched to svn for source, new branches did not bump all the $FreeBSD$ tags. That is a side effect of the way that the SVN -> CVS exporter works (and arguably a bug). BTW, I did design etcupdate to support this sort of use case (you can build a tarball from a given release tree and use that as the basis for comparisons assuming you were bootstrapped to use etcupdate). Currently freebsd-update doesn't use etcupdate and the author doesn't have any interest in changing it to do so. At some point if I have some time to hack on freebsd-update to be more useful for modified versions of FreeBSD (e.g. building snaps from tags in an SVN repository instead of a directory of patches against a CVS checkout), I will probably hack it to support using etcupdate to manage /etc updates as well. (etcupdate uses something akin to 'svn up' to update files in /etc, so things like $FreeBSD$ changes just auto-update assuming they don't result in merge conficts.) -- John Baldwin