From owner-freebsd-hackers@FreeBSD.ORG  Thu Jan 15 22:15:13 2004
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7468416A4CF
	for <hackers@freebsd.org>; Thu, 15 Jan 2004 22:15:13 -0800 (PST)
Received: from mail.ubergeeks.com (lorax.ubergeeks.com [209.145.65.55])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 43B7743D5E
	for <hackers@freebsd.org>; Thu, 15 Jan 2004 22:15:12 -0800 (PST)
	(envelope-from adrian+freebsd-hackers@ubergeeks.com)
Received: from mail.ubergeeks.com (localhost [127.0.0.1])
	by mail.ubergeeks.com (8.12.9p2/8.12.9) with ESMTP id i0G6F5qZ047743;
	Fri, 16 Jan 2004 01:15:05 -0500 (EST)
	(envelope-from adrian+freebsd-hackers@ubergeeks.com)
Received: from localhost (adrian@localhost)i0G6F4Lx047740;
	Fri, 16 Jan 2004 01:15:05 -0500 (EST)
	(envelope-from adrian+freebsd-hackers@ubergeeks.com)
X-Authentication-Warning: lorax.ubergeeks.com: adrian owned process doing -bs
Date: Fri, 16 Jan 2004 01:15:04 -0500 (EST)
From: Adrian Filipi <adrian+freebsd-hackers@ubergeeks.com>
Sender: adrian@ubergeeks.com
To: "Michael R. Wayne" <wayne@staff.msen.com>
In-Reply-To: <200401130746.i0D7kNEk004375@manor.msen.com>
Message-ID: <20040116011400.V32954@lorax.ubergeeks.com>
References: <200401130746.i0D7kNEk004375@manor.msen.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-MailScanner-Information: Please contact the ISP for more information
X-MailScanner: Found to be clean
cc: hackers@freebsd.org
Subject: Re: Mergemaster+RCS
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 06:15:13 -0000

On Tue, 13 Jan 2004, Michael R. Wayne wrote:

>
> Although Doug Barton has written a wonderful tool, it has always
> seemed to have a major deficiency: it completely ignores the
> existance of RCS files.  I've exchanged some email with Doug and
> he has no interest in adding RCS support to mergemaster.  So I did.

	Most excellent!  This will help me very much as I too use RCS to
track local config files.

	I'll let you know how it goes after my ext update.

thanks!

	Adrian
--
[ adrian@ubergeeks.com ]