Date: Tue, 16 Oct 2001 16:17:56 -0700 From: Ulf Zimmermann <ulf@Alameda.net> To: Daniel Brown <djb@unixan.com> Cc: "Jonathan M. Slivko" <jslivko@4evermail.com>, freebsd-questions@FreeBSD.ORG, freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster -- whats the best way? Message-ID: <20011016161755.G63836@seven.alameda.net> In-Reply-To: <20011016152927.0cc816e3.djb@unixan.com>; from djb@unixan.com on Tue, Oct 16, 2001 at 03:29:27PM -0700 References: <001301c15671$6b2effe0$252da818@sioux> <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> <20011016220800.B55640@dansat.data-plan.com> <20011016152927.0cc816e3.djb@unixan.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 16, 2001 at 03:29:27PM -0700, Daniel Brown wrote: > FYI, mergemaster already has a -i flag to install new files that don't > exist in the target directory. > > As for replacing files that had not be modified since the last merge, > some sort of MD5 checksum database would probably be best. The Debian > package management system utilizes MD5 checksum during a binary package > upgrade, to determine whether it is safe to automatically replace a > configuration file owned by the package. > > Perhaps each installation performed via mergemaster can create a > plain-text list of MD5 checksums each time it installs new files, and > these files are automatically replaced during the next upgrade. To be > sure first-time upgprades to -RELEASE series occur easily, perhaps > installation media should start including such MD5 checksums. > > Personally, I was thinking of hacking this feature into my own copies of > mergemaster some time in the medium future. =) The -RELEASE have mtree.* files with the MD5 of the files in the release, but they don't seem to end up on the installed system. Another thing would be to have a cron job of some kind which builds those files once in a while, which can then be used for testing. > > -Daniel > > ------------ Quoted Message ------------ > 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? > > 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-stable" in the body of the message > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message > -- Regards, Ulf. --------------------------------------------------------------------- Ulf Zimmermann, 1525 Pacific Ave., Alameda, CA-94501, #: 510-865-0204 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011016161755.G63836>