Date: Fri, 05 Nov 1999 14:40:10 +0800 From: Foxfair Hu <foxfair@drago.cert.org.tw> To: "SUMIKAWA Munechika (pì@ß)" <sumikawa@ebina.hitachi.co.jp> 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 Message-ID: <38227BCA2B2.86F6FOXFAIR@drago.cert.org.tw> In-Reply-To: <19991105143723B.sumikawa@ebina.hitachi.co.jp> References: <19991105140645Q.shin@nd.net.fujitsu.co.jp> <19991105143723B.sumikawa@ebina.hitachi.co.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 05 Nov 1999 14:37:23 +0900 (JST) SUMIKAWA Munechika (=8ap=90=ec=8f@=8b=df) <sumikawa@ebina.hitachi.co.jp> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?38227BCA2B2.86F6FOXFAIR>