From owner-freebsd-stable@FreeBSD.ORG Tue Sep 23 01:26:59 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 D9F3016A4B3 for ; Tue, 23 Sep 2003 01:26:59 -0700 (PDT) Received: from sequel.rsm.ru (sequel.rsm.ru [213.80.139.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA3F43FFB for ; Tue, 23 Sep 2003 01:26:57 -0700 (PDT) (envelope-from aga@rsm.ru) Received: from rsm.ru (magic.rsm.ru [213.80.139.148])h8N8QpK87260; Tue, 23 Sep 2003 12:26:51 +0400 (MSD) Message-ID: <3F7003C6.2050607@rsm.ru> Date: Tue, 23 Sep 2003 12:26:46 +0400 From: Dmitry Agafonov User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3) Gecko/20030423 X-Accept-Language: ru, en-us, en MIME-Version: 1.0 To: richardcoleman@mindspring.com References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru> <447k404pr5.fsf@be-well.ilk.org> <200309221814.26301.mupi@mknet.org> <3F6FA58A.8020602@mindspring.com> In-Reply-To: <3F6FA58A.8020602@mindspring.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: OK cc: stable@freebsd.org Subject: Re: About mergemaster (Re: upgrading) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list 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 08:27:00 -0000 > 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. I do not think anybody will (and able) to track their changes. Here is the place for automatic detecton of file alteration. And finally. Yes, want to see what files are exactly changed (defaults or other parts of it). The best place to list changed files (maybe not counting typos ot similar minor changes) is UPDATING or somewhere around. -- Dmitry > Richard Coleman > richardcoleman@mindspring.com