Re: Proposal to mergemaster

2001-03-14 Thread Martin Blapp
Hmm, just some thoughts here: I modified mergemaster so he add's to every file he touches or installs this md5 checksum. When mergemaster reads a file and compares it, it extracts the md5 checksum form the file (if it exists) and looks if the file has been changed or not. If a new file get's

Re: Proposal to mergemaster

2001-03-14 Thread Jordan Hubbard
From: Martin Blapp [EMAIL PROTECTED] Subject: Re: Proposal to mergemaster Date: Wed, 14 Mar 2001 09:51:28 +0100 (CET) If it is possible to add these checksums also in sysinstall when extracting the first time you install, nothing has to be done with commit scripts and also the first time you

Re: Proposal to mergemaster

2001-03-14 Thread Martin Blapp
Hi Jordan, If it is possible to add these checksums also in sysinstall when extracting the first time you install, nothing has to be done with commit scripts and also the first time you run mergemaster, you can run it a lot more faster than now. Can you be more specific? Some diffs

Re: Proposal to mergemaster

2001-03-14 Thread Jordan Hubbard
Yes, I mean when we extract and install all /etc files, is it possible to add then then md5 checksum to all installed config files into the cvs header ? (With grep -v "$FreeBSD:" of course). Oh. No, not easily. - Jordan To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe

Re: Proposal to mergemaster

2001-03-14 Thread Matthew Thyer
Brian Somers wrote: 3. Have a cvs-aware option. If the installed and new version numbers differ, mergemaster does a cvs diff -u -rINSTALLEDVERSION newversion | patch INSTALLEDFILE. If this works, everyone's happy. If not, it forces you to modify the new file 'till there are no bits in

Re: Proposal to mergemaster

2001-03-14 Thread Johan Karlsson
At Tue, 13 Mar 2001 16:53:46 +0100, Martin Blapp wrote: Hi, I have made something like this and submitted a PR http://www.freebsd.org/cgi/query-pr.cgi?pr=25771 Yep, something like this I'd like to do, but with md5 checksums, so we do not have to say 'yes' to each file we update. I

Re: Proposal to mergemaster

2001-03-13 Thread Julian Elischer
Martin Blapp wrote: Hi, After 100erts of mergemaster sessions, I'm looking for a way to improve mergemaster. 1st thing, mergemaster displays per default all in changed files. That's ok for the first time, but if you maintain many hosts, this is annoying a lot. There should be an

Re: Proposal to mergemaster

2001-03-13 Thread Martin Blapp
Hi, If you didn't change a file and it was at 1.45 then if the new one is at 1.55 you should just install it. Since you didn't touch it at 1.45 you will probably not want to touch it at 1.55 either. yes, of course. but I don't see your point. Am I missing something ? How can you see it

Re: Proposal to mergemaster

2001-03-13 Thread Maxim Sobolev
Martin Blapp wrote: Hi, If you didn't change a file and it was at 1.45 then if the new one is at 1.55 you should just install it. Since you didn't touch it at 1.45 you will probably not want to touch it at 1.55 either. yes, of course. but I don't see your point. Am I missing

Re: Proposal to mergemaster

2001-03-13 Thread Maxim Sobolev
Maxim Sobolev wrote: Martin Blapp wrote: Hi, If you didn't change a file and it was at 1.45 then if the new one is at 1.55 you should just install it. Since you didn't touch it at 1.45 you will probably not want to touch it at 1.55 either. yes, of course. but I don't see

Re: Proposal to mergemaster

2001-03-13 Thread Peter Jeremy
On 2001-Mar-13 09:09:21 -0800, Julian Elischer [EMAIL PROTECTED] wrote: If you didn't change a file and it was at 1.45 then if the new one is at 1.55 you should just install it. Since you didn't touch it at 1.45 you will probably not want to touch it at 1.55 either. But you might still need to

Re: Proposal to mergemaster

2001-03-13 Thread Jordan Hubbard
Hmmm, this is nice! I've wanted this option for a long time. :) - Jordan To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message

RE: Proposal to mergemaster

2001-03-13 Thread Daniel O'Connor
On 13-Mar-01 Martin Blapp wrote: 1. Add md5 checksum to the the file-header: --- Add an md5 checksum in the header of the File, maybe in $FreeBSD$ when the file get's comitted. (The $FreeBSD$ line should be sed'd/grepp'd out to md5 the raw

Re: Proposal to mergemaster

2001-03-13 Thread Brian Somers
Hi, After 100erts of mergemaster sessions, I'm looking for a way to improve mergemaster. 1st thing, mergemaster displays per default all in changed files. That's ok for the first time, but if you maintain many hosts, this is annoying a lot. There should be an options to display all