From owner-freebsd-stable@FreeBSD.ORG Thu Apr 29 18:14:10 2004 Return-Path: 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 516F616A4CF for ; Thu, 29 Apr 2004 18:14:10 -0700 (PDT) Received: from out009.verizon.net (out009pub.verizon.net [206.46.170.131]) by mx1.FreeBSD.org (Postfix) with ESMTP id D297643D3F for ; Thu, 29 Apr 2004 18:14:09 -0700 (PDT) (envelope-from dgl@kirk.dlee.org) Received: from kirk.dlee.org ([141.156.37.12]) by out009.verizon.net (InterMail vM.5.01.06.06 201-253-122-130-106-20030910) with ESMTP id <20040430011409.OTEZ29216.out009.verizon.net@kirk.dlee.org> for ; Thu, 29 Apr 2004 20:14:09 -0500 Received: from kirk.dlee.org (dgl@localhost.dlee.org [127.0.0.1]) by kirk.dlee.org (8.12.9p2/8.12.9) with ESMTP id i3U1E8G9057882 for ; Thu, 29 Apr 2004 21:14:08 -0400 (EDT) (envelope-from dgl@kirk.dlee.org) Received: (from dgl@localhost) by kirk.dlee.org (8.12.9p2/8.12.9/Submit) id i3U1E736057881 for freebsd-stable@freebsd.org; Thu, 29 Apr 2004 21:14:07 -0400 (EDT) (envelope-from dgl) Date: Thu, 29 Apr 2004 21:14:06 -0400 From: Doug Lee To: freebsd-stable@freebsd.org Message-ID: <20040430011406.GA55912@kirk.dlee.org> Mail-Followup-To: Doug Lee , freebsd-stable@freebsd.org References: <20040429215917.GZ55912@kirk.dlee.org> <20040429233415.GA18937@grummit.biaix.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040429233415.GA18937@grummit.biaix.org> Organization: Bartimaeus Group User-Agent: Mutt/1.5.4i X-Authentication-Info: Submitted using SMTP AUTH at out009.verizon.net from [141.156.37.12] at Thu, 29 Apr 2004 20:14:08 -0500 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 01:14:10 -0000 On Fri, Apr 30, 2004 at 01:34:15AM +0200, Joan Picanyol wrote: > * Doug Lee [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. Might try that...a good start on what I want I think. I'd want to manage /etc, /usr/local/etc, and maybe another place or two with this, which I think is supported via multiple runs and carefully-constructed command lines. Only one thing still missing in my book: No change history as in CVS, which would let me repeal an errant update pretty painlessly. I know most users might not want a CVS repository hanging around, but I'd like it, both for the backup and for semi-automated logging (cvs log) of admin changes to an entire system. Come to think of it, a CVS-based system might be adaptable to managing a whole bunch of similar systems via branching and semi- or fully-automatic merging among them. I haven't thought long enough about that to say more though. -- Doug Lee dgl@dlee.org http://www.dlee.org Bartimaeus Group doug@bartsite.com http://www.bartsite.com "The most exhausting thing in life is being insincere." - Anne Morrow Lindbergh {American Author}