From owner-cvs-all Sun Feb 16 8:25:37 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD64A37B401; Sun, 16 Feb 2003 08:25:33 -0800 (PST) Received: from procyon.firepipe.net (procyon.firepipe.net [198.78.66.151]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3765543F85; Sun, 16 Feb 2003 08:25:29 -0800 (PST) (envelope-from will@csociety.org) Received: by procyon.firepipe.net (Postfix, from userid 1000) id 4C3D521AC0; Sun, 16 Feb 2003 08:25:28 -0800 (PST) Date: Sun, 16 Feb 2003 08:25:28 -0800 From: Will Andrews To: "Daniel C. Sobral" Cc: Dag-Erling Smorgrav , 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> References: <200302161307.h1GD7LW2008268@repoman.freebsd.org> <3E4FA9D8.3080408@tcoip.com.br> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3E4FA9D8.3080408@tcoip.com.br> User-Agent: Mutt/1.4i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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-all" in the body of the message