From owner-freebsd-hackers@FreeBSD.ORG Wed Nov 28 03:48:31 2007 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 9907E16A498 for ; Wed, 28 Nov 2007 03:48:31 +0000 (UTC) (envelope-from youshi10@u.washington.edu) Received: from mxout7.cac.washington.edu (mxout7.cac.washington.edu [140.142.32.178]) by mx1.freebsd.org (Postfix) with ESMTP id 7726513C4CE for ; Wed, 28 Nov 2007 03:48:31 +0000 (UTC) (envelope-from youshi10@u.washington.edu) Received: from smtp.washington.edu (smtp.washington.edu [140.142.32.141] (may be forged)) by mxout7.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.09) with ESMTP id lAS3mUBe016757 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 Nov 2007 19:48:31 -0800 X-Auth-Received: from [128.208.7.160] (shiina.dyn.cs.washington.edu [128.208.7.160]) (authenticated authid=youshi10) by smtp.washington.edu (8.13.7+UW06.06/8.13.7+UW07.09) with ESMTP id lAS3mUZv012257 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 27 Nov 2007 19:48:30 -0800 In-Reply-To: <474CE455.6070603@gmail.com> References: <474CE455.6070603@gmail.com> Mime-Version: 1.0 (Apple Message framework v752.2) X-Gpgmail-State: !signed Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <2072C94B-26F4-4ABA-8E09-A409006F052A@u.washington.edu> Content-Transfer-Encoding: 7bit From: Garrett Cooper Date: Tue, 27 Nov 2007 19:45:16 -0800 To: "Aryeh M. Friedman" X-Mailer: Apple Mail (2.752.2) X-PMX-Version: 5.3.3.310218, Antispam-Engine: 2.5.2.313940, Antispam-Data: 2007.11.27.193445 X-Uwash-Spam: Gauge=IIIIIII, Probability=7%, Report='BODY_SIZE_800_899 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0' Cc: hackers@freebsd.org Subject: Re: idea bouncing: using cvs as a replacement for mergemaster 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: Wed, 28 Nov 2007 03:48:31 -0000 On Nov 27, 2007, at 7:45 PM, Aryeh M. Friedman wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > 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? > > - -- > 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 > > iD8DBQFHTORVJ9+1V27SttsRAqcuAJ4sW4ObPrnUi6az4T+NQebCVMbDCQCfUS+i > gCRv9mwC2mu6B4LAPZ9bW3s= > =tD/k > -----END PGP SIGNATURE----- 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