From owner-freebsd-stable Tue Aug 6 9: 3:55 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A402E37B400 for ; Tue, 6 Aug 2002 09:03:52 -0700 (PDT) Received: from alydar.infoteam.com (alydar.infoteam.com [207.246.83.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3FAE43E5E for ; Tue, 6 Aug 2002 09:03:51 -0700 (PDT) (envelope-from kmartin@infoteam.com) Received: from [10.0.0.10] (yoda.ksm.com [207.87.82.146]) by alydar.infoteam.com (Postfix) with ESMTP id 340756E74F for ; Tue, 6 Aug 2002 12:03:49 -0400 (EDT) Date: Tue, 06 Aug 2002 12:03:55 -0400 From: Kenn Martin Reply-To: Kenn Martin To: freebsd-stable@FreeBSD.ORG Subject: Re: Small request for updating Message-ID: <693824546.1028635435@[10.0.0.10]> In-Reply-To: <20020806.112323.640905522.davep@meduseld.net> References: <20020806.103017.607958984.davep@meduseld.net> <20020806164558.A47719@ei.bzerk.org> <20020806.112323.640905522.davep@meduseld.net> X-Mailer: Mulberry/3.0.0a3 (Win32) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --On Tuesday, August 06, 2002 11:23 AM -0400 "David A. Panariti" wrote: >>>>>> "Ruben" == Ruben de Groot writes: > > Ruben> On Tue, Aug 06, 2002 at 10:30:17AM -0400, David A. Panariti > Ruben> typed: > >> (Sorry about the empty message, shaky fingers on a small laptop > >> keyboard) > >> > >> This is really a request for the security branch (RELENG_X_y). > >> Would it be too much to ask that the updaters of UPDATING add a > >> small comment as to whether or not a mergemaster run is needed > >> if updating from the previous patch? > >> > >> I follow stable and the security lists, but being fallible I may > >> miss something. Mergemaster is *the* most time consuming step > >> from my perspective since it is interactive. If the committers > >> knew whether or not file(s) changed such that a mergemaster was > >> needed, that little bit of info would be a huge time saver. > > Ruben> If no file(s) changed, mergemaster will exit without needing > Ruben> interaction. Just make sure everytime there is a change, > Ruben> you merge the line from the new file containing the files > Ruben> version id string into your version of the file. > D'OH! I had just started doing this on my last mergemaster, and > haven't done one since. All of the previous times, I'd left version > id intact and so had tons of diffs, which always left the feeling of > a mergemaster being too much work. > While it mentions diffing ids in the manual, it didn't dawn on me > until recently that changing the id in a file with no other pertinent > changes would be so useful. We also use a config that speeds things up a bit: %cat /etc/mergemaster.rc AUTO_INSTALL=yes COMP_CONFS=yes IGNORE_MOTD=yes Kenn To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message