From owner-freebsd-questions Tue Oct 16 12:17:38 2001 Delivered-To: freebsd-questions@freebsd.org Received: from clink.schulte.org (clink.schulte.org [209.134.156.193]) by hub.freebsd.org (Postfix) with ESMTP id C68A137B40A; Tue, 16 Oct 2001 12:17:33 -0700 (PDT) Received: from schulte-laptop.schulte.org (nb-65.netbriefings.com [209.134.134.65]) by clink.schulte.org (Postfix) with ESMTP id 551EF243FD; Tue, 16 Oct 2001 14:17:32 -0500 (CDT) Message-Id: <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> X-Sender: schulte@pop.schulte.org X-Mailer: QUALCOMM Windows Eudora Version 5.1 Date: Tue, 16 Oct 2001 14:16:19 -0500 To: "Jonathan M. Slivko" , From: Christopher Schulte Subject: Re: mergemaster -- whats the best way? Cc: In-Reply-To: <001301c15671$6b2effe0$252da818@sioux> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; format=flowed 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 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. You should *always* have backups of /etc available before you do any of this. >-- >Jonathan M. Slivko >Head Systems Administrator, 4EverMail Hosting Services >http://www.4evermail.com -- Are YOU ready for the new Internet? --chris To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message