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