Date: Wed, 14 Mar 2001 01:37:35 +0000 From: Brian Somers <brian@Awfulhak.org> To: Martin Blapp <mb@imp.ch> Cc: current@FreeBSD.ORG, brian@Awfulhak.org Subject: Re: Proposal to mergemaster Message-ID: <200103140137.f2E1bZa10327@hak.lan.Awfulhak.org> In-Reply-To: Message from Martin Blapp <mb@imp.ch> of "Tue, 13 Mar 2001 13:41:47 %2B0100." <Pine.BSF.4.21.0103131202110.988-100000@levais.imp.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
>
> 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 <brian@Awfulhak.org> <brian@[uk.]FreeBSD.org>
<http://www.Awfulhak.org>; <brian@[uk.]OpenBSD.org>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103140137.f2E1bZa10327>