From owner-freebsd-current  Tue Mar 13  9:10: 9 2001
Delivered-To: freebsd-current@freebsd.org
Received: from filk.iinet.net.au (syncopation-dns.iinet.net.au [203.59.24.29])
	by hub.freebsd.org (Postfix) with SMTP id 00D9237B719
	for <current@freebsd.org>; Tue, 13 Mar 2001 09:10:01 -0800 (PST)
	(envelope-from julian@elischer.org)
Received: (qmail 12871 invoked by uid 666); 13 Mar 2001 17:11:06 -0000
Received: from i074-115.nv.iinet.net.au (HELO elischer.org) (203.59.74.115)
  by mail.m.iinet.net.au with SMTP; 13 Mar 2001 17:11:06 -0000
Message-ID: <3AAE5441.3E40F2A3@elischer.org>
Date: Tue, 13 Mar 2001 09:09:21 -0800
From: Julian Elischer <julian@elischer.org>
X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 5.0-CURRENT i386)
X-Accept-Language: en, hu
MIME-Version: 1.0
To: Martin Blapp <mb@imp.ch>
Cc: current@freebsd.org
Subject: Re: Proposal to mergemaster
References: <Pine.BSF.4.21.0103131202110.988-100000@levais.imp.ch>
Content-Type: text/plain; charset=iso-8859-15
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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 options to display all changed files anyway, so you
> can watch what has changed. (but off by default)
> 
> So I have ideas to improve merge-master:
> 
> 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 file without checksum.)
> 
> grep -v "$FreeBSD:" defaults/rc.conf | md5
> 
> Example:
> 
> # $FreeBSD: src/etc/defaults/rc.conf,v 1.53.2.15 2001/01/28
> 20:57:35 jdp Exp md5="1fff7b9d6f6daa0ea9635873bfd0b7cd" $
> 
> Then mergemaster can do a md5 over the config file and look
> if the file has changed. If so, you get asked to merge or
> install a newer version. If the md5 checksum is the same,
> the config file get's updated without asking the user.
> 
> 2. Have a special database with md5 checksums
> ---------------------------------------------
> 
> The advantage here is that we can use this for binarys also, and
> this allows us to have binary updates for, let's say, security
> fixes. For old unsupported releases that's a very good thing.
> 
> The database stores all md5 checksums for every version of a configfile
> we had (for this branch so it dosn't get to big ?)
> 
> The database could also be very useful for later usage in the ports-
> tree (handle make update)





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.

> 
> Other ideas are welcome
> Martin
> 
> Martin Blapp, mb@imp.ch
> ------------------------------------------------
> Improware AG, UNIX solution and service provider
> Zurlindenstrasse 29, 4133 Pratteln, Switzerland
> Phone: +41 79 370 26 05, Fax: +41 61 826 93 01
> ------------------------------------------------
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-current" in the body of the message

-- 
      __--_|\  Julian Elischer
     /       \ julian@elischer.org
    (   OZ    ) World tour 2000-2001
---> X_.---._/  
            v

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message