From owner-freebsd-hackers@FreeBSD.ORG Fri Apr 23 13:34:25 2010 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2FDB1065672; Fri, 23 Apr 2010 13:34:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 93A518FC16; Fri, 23 Apr 2010 13:34:25 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 4893F46B9D; Fri, 23 Apr 2010 09:34:25 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 75DE98A026; Fri, 23 Apr 2010 09:34:24 -0400 (EDT) From: John Baldwin To: freebsd-hackers@freebsd.org Date: Fri, 23 Apr 2010 08:47:27 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201003231108.45102.jhb@freebsd.org> <20100422144127.GW92627@acme.spoerlein.net> <20100423065015.GJ10699@over-yonder.net> In-Reply-To: <20100423065015.GJ10699@over-yonder.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Message-Id: <201004230847.28013.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Fri, 23 Apr 2010 09:34:24 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Sergey Babkin , "Matthew D. Fuller" , Doug Barton , hackers@freebsd.org, Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?= , Jeremie Le Hen Subject: Re: /etc in CVS 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: Fri, 23 Apr 2010 13:34:25 -0000 On Friday 23 April 2010 2:50:15 am Matthew D. Fuller wrote: > On Thu, Apr 22, 2010 at 04:41:27PM +0200 I heard the voice of > Ulrich Sp=F6rlein, and lo! it spake thus: > >=20 > > I have a .hg directory sitting in / for every machine I usually take > > care of. hgignore is of course set to *, so only explicitly added files > > are tracked. >=20 > I do pretty much the same thing (except mine has .bzr/ and .bzrignore > ;). Using the VCS to handle updates requires something a bit broader > though. I HAVE considered it. You'd need to do the sort of 'make > install' stuff mergemaster does to a tempdir, and make a branch there > checking in the snapshots, and have your etc be a derived branch from > that. That way you have all the VCS merge capabilities to do the > merges and track where they came from. >=20 > Mergemaster works well enough that I've given no serious thought > beyond idle "that would be cool" thinking on the matter though 8-} etcupdate essentially seeks to do a simplified version of the vendor import= s=20 by just keeping the last two imports around so that each new import can be= =20 applied. This does mean it is more limited than a full source code control= =20 solution, but it also ends up being more lightweight. =2D-=20 John Baldwin