From owner-freebsd-stable@FreeBSD.ORG Mon Sep 22 18:44:33 2003 Return-Path: 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 70AF216A4B3 for ; Mon, 22 Sep 2003 18:44:33 -0700 (PDT) Received: from heron.mail.pas.earthlink.net (heron.mail.pas.earthlink.net [207.217.120.189]) by mx1.FreeBSD.org (Postfix) with ESMTP id 511074400E for ; Mon, 22 Sep 2003 18:44:32 -0700 (PDT) (envelope-from richardcoleman@mindspring.com) Received: from c-24-98-233-138.atl.client2.attbi.com ([24.98.233.138] helo=mindspring.com) by heron.mail.pas.earthlink.net with asmtp (Exim 3.33 #1) id 1A1cEB-0004Fu-00 for stable@freebsd.org; Mon, 22 Sep 2003 18:44:31 -0700 Message-ID: <3F6FA58A.8020602@mindspring.com> Date: Mon, 22 Sep 2003 21:44:42 -0400 From: Richard Coleman Organization: Critical Magic, Inc. User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.4) Gecko/20030624 X-Accept-Language: en-us, en MIME-Version: 1.0 To: stable@freebsd.org References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru> <447k404pr5.fsf@be-well.ilk.org> <200309221814.26301.mupi@mknet.org> In-Reply-To: <200309221814.26301.mupi@mknet.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-ELNK-Trace: 1ee258965991efcb0865379cdb43356e5e89bb4777695beb702e37df12b9c9ef48f63a5d71260883faaaac5757c96ebc350badd9bab72f9c350badd9bab72f9c Subject: Re: About mergemaster (Re: upgrading) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: richardcoleman@mindspring.com List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Sep 2003 01:44:33 -0000 >>far as I can see from the PR database. The mergemaster author didn't >>especially like the idea, because he thinks people ought to know how >>their computers are configured. >> >>I'll be happy to take a look at your patches when you get it working. > > The only problem with this theory is a significant number of the files flagged > by mergemaster, the only difference is the cvs version tag (in theory, this > shouldn't be happening, since the cvs tag shouldn't update unless something > in the file changes, but I have seen this nonetheless. Somewhat along the > same lines are files where the only changes are changes to typos in comments, > or adding/deleting comments, which have no functional difference on the file > itself.). I've been thinking about a simple, brute force solution. Just add a new switch to mergemaster to automatically merge, and then have an "exception list". For instance, say "mergemaster -A" is the command to automatically merge. It could easily do an automatic merge for all files except for a given list: donotmerge="/etc/rc.conf /etc/hosts /etc/passwd /etc/group" If a file in this list has changed, then mergemaster would drop into the interactive mode like it current does". As I configure a server, I would just add any file I manually edit to this list. Although not perfect, it would handle 90% of the cases. Richard Coleman richardcoleman@mindspring.com