From owner-freebsd-stable Tue Oct 15 10:58:14 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 5360B37B401 for ; Tue, 15 Oct 2002 10:58:13 -0700 (PDT) Received: from sep.oldach.net (sep.oldach.net [194.180.25.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8841D43EB1 for ; Tue, 15 Oct 2002 10:58:11 -0700 (PDT) (envelope-from hmo@sep.oldach.net) Received: from sep.oldach.net (localhost [127.0.0.1]) by sep.oldach.net (8.12.6/8.12.6/hmo29jun02) with ESMTP id g9FHw7v1061071 (version=TLSv1/SSLv3 cipher=EDH-DSS-DES-CBC3-SHA bits=168 verify=NO); Tue, 15 Oct 2002 19:58:08 +0200 (CEST) (envelope-from hmo@sep.oldach.net) Received: (from hmo@localhost) by sep.oldach.net (8.12.6/8.12.6/Submit) id g9FHvxQY061069; Tue, 15 Oct 2002 19:57:59 +0200 (CEST) (envelope-from hmo) Message-Id: <200210151757.g9FHvxQY061069@sep.oldach.net> Subject: Re: Some Changes to Mergemaster In-Reply-To: <200210142214.g9EMEBPm005321@apollo.backplane.com> from Matthew Dillon at "Oct 14, 2002 3:14:11 pm" To: dillon@apollo.backplane.com (Matthew Dillon) Date: Tue, 15 Oct 2002 19:57:59 +0200 (CEST) Cc: drosih@rpi.edu, crist.clark@attbi.com, trish@bsdunix.net, aw1@stade.co.uk, c.scott@uk.tiscali.com, freebsd-stable@FreeBSD.ORG From: 15oct02@oldach.net (Helge Oldach) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 Matthew Dillon: > Here is my current patch set (patch #3) to mergemaster. It implements > the following: > > (1) clears the terminal window for each presentation. > (2) Initial diff does not use the pager and chops it to fit on a single > screen. This fixes the problem where you would sometimes be left > in the pager and sometimes not be left in the pager What you really want to do is to use less(1) as the PAGER, add the -c option for case (1), and possibly remove the -e option for case (2). No need to change anything about mergemaster to achieve this. > Other possible improvements that could be done (not implemented in this > patch) include checking the file against previous CVS revs and having > a list of 'always replace' files, typically /etc/rc* and /etc/defaults/* > (for example), possibly enabled via a switch. I would rather prefer some automatic way achieve the opposite, by having a "never replace" list. Usually this "never replace" list would be just the set of files that are different between /etc and /usr/src/etc (or the /var/tmp/temproot/etc variant of the latter). Having all other files (without proprietary modifications) upgraded automatically (by means of a mergemaster option, of course) would speed up mergemaster runs dramatically. Note this is different from -a which would actually compare the source and installed versions but not replace files without proprietary modifications but with revision updates. Helge To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message