From owner-freebsd-stable Tue Oct 15 2:12:23 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 F045437B401 for ; Tue, 15 Oct 2002 02:12:21 -0700 (PDT) Received: from pakastelohi.cypherpunks.to (pakastelohi.cypherpunks.to [213.130.163.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D1CA43EC5 for ; Tue, 15 Oct 2002 02:12:21 -0700 (PDT) (envelope-from shamrock@cypherpunks.to) Received: from VAIO650 (d160.nas2.sr2.sonic.net [208.201.229.160]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by pakastelohi.cypherpunks.to (Postfix) with ESMTP id 5AE0936485 for ; Tue, 15 Oct 2002 11:12:19 +0200 (CEST) From: "Lucky Green" To: Subject: Mergemaster [was: Re: Ifconfig config of gif tunnels] Date: Tue, 15 Oct 2002 02:11:22 -0700 Message-ID: <004401c2742a$d6169d90$6501a8c0@VAIO650> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.2627 Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 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 wrote about mergemaster: ----------------- I also like the idea someone posted in regards to having a list of files 'typically never modified by the sysop', e.g. /etc/defaults/*, /etc/rc*, and so forth, though with the patches I have so far that particular problem is not so big a deal any more (at least not for me). ----------------- Mergemaster automatically updating the various default files, displaying to the admin only the files the admin actually might want to see during a normal upgrade, would be quite desirable to me. What would also be helpful, though this may be diff's fault, would be if there were less tendency for mergemaster to combine changes the admin likely wants to make (adding a new user the OS requires) with changes the admin does not want to make (removing surrounding entries out of master.passwd), requiring the admin to make a note of mergemaster's suggestions followed by editing the file by hand. Thanks, --Lucky Green To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message