From owner-freebsd-current Tue Mar 13 17:34:27 2001 Delivered-To: freebsd-current@freebsd.org Received: from Awfulhak.org (awfulhak.demon.co.uk [194.222.196.252]) by hub.freebsd.org (Postfix) with ESMTP id 2A4C737B719 for ; Tue, 13 Mar 2001 17:34:24 -0800 (PST) (envelope-from brian@Awfulhak.org) Received: from hak.lan.Awfulhak.org (root@hak.lan.Awfulhak.org [172.16.0.12]) by Awfulhak.org (8.11.2/8.11.2) with ESMTP id f2E1aeC17088; Wed, 14 Mar 2001 01:36:40 GMT (envelope-from brian@lan.Awfulhak.org) Received: from hak.lan.Awfulhak.org (brian@localhost [127.0.0.1]) by hak.lan.Awfulhak.org (8.11.3/8.11.3) with ESMTP id f2E1bZa10327; Wed, 14 Mar 2001 01:37:35 GMT (envelope-from brian@hak.lan.Awfulhak.org) Message-Id: <200103140137.f2E1bZa10327@hak.lan.Awfulhak.org> X-Mailer: exmh version 2.3.1 01/18/2001 with nmh-1.0.4 To: Martin Blapp Cc: current@FreeBSD.ORG, brian@Awfulhak.org Subject: Re: Proposal to mergemaster In-Reply-To: Message from Martin Blapp of "Tue, 13 Mar 2001 13:41:47 +0100." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 14 Mar 2001 01:37:35 +0000 From: Brian Somers Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > > 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: > ------------------------------------------- [.....] > 2. Have a special database with md5 checksums > --------------------------------------------- [.....] 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 it. > 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 > ------------------------------------------------ -- Brian Don't _EVER_ lose your sense of humour ! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message