Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Feb 2003 08:25:28 -0800
From:      Will Andrews <will@csociety.org>
To:        "Daniel C. Sobral" <dcs@tcoip.com.br>
Cc:        Dag-Erling Smorgrav <des@FreeBSD.org>, src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/etc newsyslog.conf
Message-ID:  <20030216162528.GE20600@procyon.firepipe.net>
In-Reply-To: <3E4FA9D8.3080408@tcoip.com.br>
References:  <200302161307.h1GD7LW2008268@repoman.freebsd.org> <3E4FA9D8.3080408@tcoip.com.br>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Feb 16, 2003 at 12:10:16PM -0300, Daniel C. Sobral wrote:
> Argh. Mergemaster hell.

You know, it wouldn't be such a problem if there was an assistant
shell script for mergemaster that allows people to decide in
advance which files they want to be consulted on changes to, and
just copy the rest.  Especially since the vast majority of files
are copied verbatim, or at least should be.  :)

I once wrote such a script, but unfortunately it didn't work
properly when used as MM_PRE_COMPARE_SCRIPT, even though it
worked fine when executed before mergemaster was run.  :-\

Regards,
-- 
wca

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030216162528.GE20600>