From owner-freebsd-questions Tue Oct 16 14: 7: 8 2001 Delivered-To: freebsd-questions@freebsd.org Received: from brockman.tinet.ie (mail1.tinet.ie [159.134.237.20]) by hub.freebsd.org (Postfix) with ESMTP id EB28937B40D; Tue, 16 Oct 2001 14:07:01 -0700 (PDT) Received: from p871.as1.limerick1.eircom.net ([159.134.167.103] helo=dansat.data-plan.com) by brockman.tinet.ie with esmtp (Exim 2.05 #23) id 15tbQP-0006A0-00; Tue, 16 Oct 2001 22:06:59 +0100 Received: (from timbo@localhost) by dansat.data-plan.com (8.11.6/8.11.6) id f9GL81455920; Tue, 16 Oct 2001 22:08:01 +0100 (BST) (envelope-from timbo) Date: Tue, 16 Oct 2001 22:08:00 +0100 From: Tim Bunce To: Christopher Schulte Cc: "Jonathan M. Slivko" , freebsd-questions@freebsd.org, freebsd-stable@freebsd.org Subject: Re: mergemaster -- whats the best way? Message-ID: <20011016220800.B55640@dansat.data-plan.com> References: <001301c15671$6b2effe0$252da818@sioux> <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org>; from christopher@schulte.org on Tue, Oct 16, 2001 at 02:16:19PM -0500 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Oct 16, 2001 at 02:16:19PM -0500, Christopher Schulte wrote: > At 02:30 PM 10/16/2001 -0400, Jonathan M. Slivko wrote: > >Hello all, > > > >Whats the best way about going to do a mergemaster without having to read > >through every single change, modification, etc. Is there some kind of script > >that will automatically merge the changes into the existing files without > >much user intervention? (e.g. unattended?) > >-- Jonathan > > Automatic merging would be a very bad thing. Here's how I do it: > > If the changed file is one I made no local modifications to, aka was the > default per my previous install, I let mergemaster replace the old file > completely. > > If the file didn't exist in my previous install, I let mergemaster install it. > > If the changed file is one I made modifications to, I leave it be and merge > the changes on my own. I then rerun mergemaster until it tells me all > files are updated. Of course some way could be found to let mergemaster detect the first case (based on saving 'master copies of installed /etc files' somewhere I guess). The second is trivial. That just leaves the third. I think having some way to let mergemaster only hassle users with questions about files they've modified previously makes a lot of sense. Tim. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message