From owner-freebsd-current@FreeBSD.ORG  Wed Nov 28 08:58:00 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B930B16A418
	for <freebsd-current@freebsd.org>; Wed, 28 Nov 2007 08:58:00 +0000 (UTC)
	(envelope-from keramida@ceid.upatras.gr)
Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1FE13C468
	for <freebsd-current@freebsd.org>; Wed, 28 Nov 2007 08:57:59 +0000 (UTC)
	(envelope-from keramida@ceid.upatras.gr)
Received: from kobe.laptop (dialup95.ach.sch.gr [81.186.70.95])
	(authenticated bits=128)
	by igloo.linux.gr (8.14.1/8.14.1/Debian-9) with ESMTP id lAS8vfv4017043
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Wed, 28 Nov 2007 10:57:52 +0200
Received: from kobe.laptop (kobe.laptop [127.0.0.1])
	by kobe.laptop (8.14.2/8.14.2) with ESMTP id lAS8vcbL002361;
	Wed, 28 Nov 2007 10:57:38 +0200 (EET)
	(envelope-from keramida@ceid.upatras.gr)
Received: (from keramida@localhost)
	by kobe.laptop (8.14.2/8.14.2/Submit) id lAS8vXTF002353;
	Wed, 28 Nov 2007 10:57:33 +0200 (EET)
	(envelope-from keramida@ceid.upatras.gr)
Date: Wed, 28 Nov 2007 10:57:32 +0200
From: Giorgos Keramidas <keramida@ceid.upatras.gr>
To: "Aryeh M. Friedman" <aryeh.friedman@gmail.com>
Message-ID: <20071128085732.GA2276@kobe.laptop>
References: <474CE455.6070603@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <474CE455.6070603@gmail.com>
X-Hellug-MailScanner: Found to be clean
X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached,
	score=-3.945, required 5, autolearn=not spam, ALL_TRUSTED -1.80,
	AWL 0.45, BAYES_00 -2.60)
X-Hellug-MailScanner-From: keramida@ceid.upatras.gr
X-Spam-Status: No
Cc: freebsd-current@freebsd.org
Subject: Re: idea bouncing: using cvs as a replacement for mergemaster
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Nov 2007 08:58:00 -0000

On 2007-11-27 22:45, "Aryeh M. Friedman" <aryeh.friedman@gmail.com> wrote:
> I was thinking seeing the fact that I already have a cvs repo of
> - -current does it make sense to just use CVS to update /etc instead of
> mergemaster... if so any ideas on doing it cleanly?

It may work, but it doesn't ``scale'' to dozens of machines, and you
still have to do merging when upstream files (the ones in the FreeBSD
repository) change.  It's not particularly hard to merge with CVS, if
you consider the src/etc files of FreeBSD a ``vendor branch'', but it's
not exactly a fun ride either.