From owner-freebsd-questions@FreeBSD.ORG Wed Nov 28 03:54:48 2007 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B45D816A418 for ; Wed, 28 Nov 2007 03:54:48 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: from hu-out-0506.google.com (hu-out-0506.google.com [72.14.214.238]) by mx1.freebsd.org (Postfix) with ESMTP id 3C99113C43E for ; Wed, 28 Nov 2007 03:54:48 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: by hu-out-0506.google.com with SMTP id 28so1534805hub for ; Tue, 27 Nov 2007 19:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; bh=GQnkpOW7n747aZisDaEtt3p/Pjhe/8bF53uKmpMv01M=; b=wg6s9iKE1waTPX8edtPYWf7z59PkfUUsqkxiBj1yHO8fptTHJNErR+eCtjZsXBnJ0IBpBzK7+1a9eUBT0mLIeqQY57UEB9LUmCNpfkpXCsPCKUTyyq3/kjT3NYSYA19/Ae1JVUnIjOGIJXEN7FiIg9CWrLgF2sF82pkTBiKSAyk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; b=jEYd8L6eLljbEQqHyiLq60Z6kk+eVBITaEfG4pRZqDMARNk3NC1Jpz1DkfnOS4CqizcA3Me1LT4C3XfiRTo1oh6O8aBury/rXizr7xQ/8AjTzs0p7hxnegqfCF6EYGWsA98J+bTD2khjAKro9COacmlV0D6AqIxlwB45zBPZz50= Received: by 10.65.124.8 with SMTP id b8mr10296518qbn.1196222086274; Tue, 27 Nov 2007 19:54:46 -0800 (PST) Received: from ?192.168.2.2? ( [67.85.89.184]) by mx.google.com with ESMTPS id a29sm2761917qbd.2007.11.27.19.54.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Nov 2007 19:54:45 -0800 (PST) Message-ID: <474CE676.2000709@gmail.com> Date: Tue, 27 Nov 2007 22:54:30 -0500 From: "Aryeh M. Friedman" User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: FreeBSD Questions References: <474CE455.6070603@gmail.com> <2072C94B-26F4-4ABA-8E09-A409006F052A@u.washington.edu> In-Reply-To: <2072C94B-26F4-4ABA-8E09-A409006F052A@u.washington.edu> X-Enigmail-Version: 0.95.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: hackers@freebsd.org Subject: Re: idea bouncing: using cvs as a replacement for mergemaster X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2007 03:54:48 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Garrett Cooper wrote: > On Nov 27, 2007, at 7:45 PM, Aryeh M. Friedman 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? > > CVS sucks and I wouldn't wish that requirement on anyone for > their base system.. > There isn't a decent idiot-proof / foolproof system out there > for defeating merging issues... > -Garrett I was talking for myself only not anyone else - -- Aryeh M. Friedman Developer, not business, friendly http://www.flosoft-systems.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHTOZ2J9+1V27SttsRAj6NAJ9WGi/BakGPvcMiRLdyX90gS0hVgQCaAqrF E1x9CjYdxLf42XbF6vus1To= =2gb8 -----END PGP SIGNATURE-----