From owner-freebsd-hackers@FreeBSD.ORG Mon Apr 19 22:31:21 2010 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6A19106566B for ; Mon, 19 Apr 2010 22:31:21 +0000 (UTC) (envelope-from jeremie@le-hen.org) Received: from smtpfb1-g21.free.fr (smtpfb1-g21.free.fr [212.27.42.9]) by mx1.freebsd.org (Postfix) with ESMTP id 4C3B38FC08 for ; Mon, 19 Apr 2010 22:31:19 +0000 (UTC) Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id 7194C2D563 for ; Tue, 20 Apr 2010 00:14:22 +0200 (CEST) Received: from smtp5-g21.free.fr (localhost [127.0.0.1]) by smtp5-g21.free.fr (Postfix) with ESMTP id 841B6D48087; Tue, 20 Apr 2010 00:14:15 +0200 (CEST) Received: from endor.tataz.chchile.org (tataz.chchile.org [82.233.239.98]) by smtp5-g21.free.fr (Postfix) with ESMTP id 97FAAD480AE; Tue, 20 Apr 2010 00:14:13 +0200 (CEST) Received: from felucia.tataz.chchile.org (felucia.tataz.chchile.org [192.168.1.9]) by endor.tataz.chchile.org (Postfix) with ESMTP id 5FF6833F10; Mon, 19 Apr 2010 22:14:13 +0000 (UTC) Received: by felucia.tataz.chchile.org (Postfix, from userid 1000) id 539BEA1155; Mon, 19 Apr 2010 22:14:13 +0000 (UTC) Date: Tue, 20 Apr 2010 00:14:13 +0200 From: Jeremie Le Hen To: Bakul Shah Message-ID: <20100419221413.GD76198@felucia.tataz.chchile.org> References: <201003231108.45102.jhb@freebsd.org> <20100324165748.7334B5B42@mail.bitblocks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100324165748.7334B5B42@mail.bitblocks.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: hackers@freebsd.org Subject: Re: /etc in CVS (was: Another tool for updating /etc) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 22:31:21 -0000 Hi Bakul, Sorry for the late reply, I'm lagging behind in my FreeBSD mailbox :). On Wed, Mar 24, 2010 at 09:57:48AM -0700, Bakul Shah wrote: > > But I wonder... why not build something like this around cvs? > Basically a three way merge is exactly what we want for /etc, > right? cvs because it is in the base system. I used to > maintain /etc changes in cvs and that was useful in keeping > track of configuration changes on shared machines. By the way, I've been storing my configuration in CVS for a long time and I have created a full-fledged tool to help this. Given you're using cvs(1) to store your changes in /etc, you may find it useful. The main purpose of the script if to verify that everything is checked in and you didn't overlook to commit a change. This can very easily be run from a crontab(5). The name of this tool is very lame, I didn't find a better one for now. If you have a proposition, I'm all opened to it! You will find a link to download the tool and the whole manpage at the following URL. An example session at the end of the manpage that show you how to use the tool interactively: http://jlh.chchile.org/cvsconfchk/ If you give it a try, do not refrain from giving me some feedback! Regards, -- Jeremie Le Hen Humans are born free and equal. But some are more equal than others. Coluche