From owner-freebsd-stable@FreeBSD.ORG  Thu Apr 29 16:34:37 2004
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A609C16A4CE
	for <freebsd-stable@freebsd.org>;
	Thu, 29 Apr 2004 16:34:37 -0700 (PDT)
Received: from grummit.biaix.org (86.Red-213-97-212.pooles.rima-tde.net
	[213.97.212.86])	by mx1.FreeBSD.org (Postfix) with SMTP id 8B3A343D4C
	for <freebsd-stable@freebsd.org>;
	Thu, 29 Apr 2004 16:34:36 -0700 (PDT)
	(envelope-from lists-freebsd-stable@biaix.org)
Received: (qmail 19122 invoked by uid 1000); 29 Apr 2004 23:34:15 -0000
Date: Fri, 30 Apr 2004 01:34:15 +0200
From: Joan Picanyol <lists-freebsd-stable@biaix.org>
To: freebsd-stable@freebsd.org
Message-ID: <20040429233415.GA18937@grummit.biaix.org>
Mail-Followup-To: freebsd-stable@freebsd.org, Doug Lee <dgl@dlee.org>
References: <20040429215917.GZ55912@kirk.dlee.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040429215917.GZ55912@kirk.dlee.org>
User-Agent: Mutt/1.4.1i
Subject: Re: Can I maintain config files as a CVS branch w/o messing up
	mergemaster etc.?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Apr 2004 23:34:37 -0000

* Doug Lee <dgl@dlee.org> [20040429 23:59]:
> Comments and ideas welcome.  Please Cc me if that's ok.
/usr/ports/sysutils/etcmerge

I don't use it (yet), but have thought about it. Please report back
(even privately) on usage if it works for you.

qvb
--
pica