Date: Tue, 16 Oct 2001 14:16:19 -0500 From: Christopher Schulte <christopher@schulte.org> To: "Jonathan M. Slivko" <jslivko@4evermail.com>, <freebsd-questions@freebsd.org> Cc: <freebsd-stable@freebsd.org> Subject: Re: mergemaster -- whats the best way? Message-ID: <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> In-Reply-To: <001301c15671$6b2effe0$252da818@sioux>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <jslivko@4evermail.com> >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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5.1.0.14.0.20011016140751.02852dc8>