From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 18:03:41 2011 Return-Path: <owner-freebsd-stable@FreeBSD.ORG> 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 5E86D106566C for <freebsd-stable@freebsd.org>; Fri, 25 Feb 2011 18:03:41 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id 3878C8FC23 for <freebsd-stable@freebsd.org>; Fri, 25 Feb 2011 18:03:40 +0000 (UTC) Received: from mail.experts-exchange.com (localhost [127.0.0.1]) by mail.experts-exchange.com (Postfix) with ESMTP id E00436F4937 for <freebsd-stable@freebsd.org>; Fri, 25 Feb 2011 10:03:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=e-e.com; h= user-agent:received:in-reply-to:content-disposition:content-type :content-type:mime-version:references:message-id:subject:subject :from:from:date:date:received:received:received; s=ee; t= 1298657020; x=1300471420; bh=OSewTAILvEM2qnhamI1GgRav+q18EUVxYiS kSDYvIVA=; b=DqX0wJW0dTHPoUN1iORexk1OfB2wYHVKM1LNq8mVlfDqQ/YyLj9 FeSNIPJ8z+5QOEmaZOcRGJjJsD7rDIATgrFkBY5RmzVuWLVcNyy/03oaWZHMobK6 4xrxlEgCAO8lAPhg4u0yTj+wtd95uHxlGnWyySRD6/4dPK7gZQR8hp0g= X-Virus-Scanned: amavisd-new at experts-exchange.com Received: from mail.experts-exchange.com ([127.0.0.1]) by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pwSmBy5YIPFO for <freebsd-stable@freebsd.org>; Fri, 25 Feb 2011 10:03:40 -0800 (PST) Received: from experts-exchange.com (unknown [72.29.180.81]) by mail.experts-exchange.com (Postfix) with SMTP id B095C6F4934 for <freebsd-stable@freebsd.org>; Fri, 25 Feb 2011 10:03:40 -0800 (PST) Received: (nullmailer pid 53869 invoked by uid 1001); Fri, 25 Feb 2011 18:00:19 -0000 Date: Fri, 25 Feb 2011 10:00:19 -0800 From: jhelfman@e-e.com To: freebsd-stable@freebsd.org Message-ID: <20110225180019.GD76063@eggman.experts-exchange.com> References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> <20110225160109.GA32260@lava.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110225160109.GA32260@lava.net> Received: from 70.135.165.185 (SquirrelMail authenticated user jhelfman) by mail.experts-exchange.com with HTTP; Fri, 25 Feb 2011 08:21:33 -0800 User-Agent: SquirrelMail/1.4.20 X-Priority: 3 (Normal) Importance: Normal 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 <freebsd-stable.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable> List-Post: <mailto:freebsd-stable@freebsd.org> List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, <mailto:freebsd-stable-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 25 Feb 2011 18:03:41 -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. 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. But then, again, I may be wrong. > We had this discussion a month or two ago. Do you have a link to this thread? > > 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 > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > >