From owner-cvs-all Thu Nov 4 22:37:44 1999 Delivered-To: cvs-all@freebsd.org Received: from drago.cert.org.tw (drago.cert.org.tw [140.117.100.10]) by hub.freebsd.org (Postfix) with ESMTP id DE48C152C1; Thu, 4 Nov 1999 22:36:03 -0800 (PST) (envelope-from foxfair@drago.cert.org.tw) Received: from foxfair (chateau.cert.org.tw [140.117.100.101]) by drago.cert.org.tw (8.9.3/8.9.3) with SMTP id OAA28318; Fri, 5 Nov 1999 14:29:45 +0800 (CST) (envelope-from foxfair@drago.cert.org.tw) Date: Fri, 05 Nov 1999 14:40:10 +0800 From: Foxfair Hu To: "SUMIKAWA Munechika (pì@ß)" Cc: peter@netplex.com.au, shin@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, sumikawa@ebina.hitachi.co.jp Subject: Re: cvs commit: src/sys - Imported sources In-Reply-To: <19991105143723B.sumikawa@ebina.hitachi.co.jp> References: <19991105140645Q.shin@nd.net.fujitsu.co.jp> <19991105143723B.sumikawa@ebina.hitachi.co.jp> Message-Id: <38227BCA2B2.86F6FOXFAIR@drago.cert.org.tw> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: Quoted-Printable X-Mailer: Becky! ver 1.25.04 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk On Fri, 05 Nov 1999 14:37:23 +0900 (JST) SUMIKAWA Munechika (=8ap=90=ec=8f@=8b=df) wr= ote: > I think we have three choices. > 1. restore the tree from backup. > If backup is made recently, I think it is the best way. > 2. back-commit for some files influence on HEAD branch > Since most of files are conflicted fotunatelly, few of files are > applied to HEAD branch automatically. We can easily back-commit > them. we can use vendor-tag as reference. > 3. make avoid confliction and merge KAME into HEAD branch. > It's rough solution, but final goal. > Please, you guys, don't touch anything anymore now. LET the CVS REPO-MEISTER FIX EVERYTHING FIRST. That's all we need. Yes, I respect your effort on FreeBSD/KAME, but NO, don't make the duplicate errors again. Twice error makes the life difficult. > --- > Munechika SUMIKAWA @ KAME Project > Cheers, -Foxfair. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message