Date: Fri, 05 Nov 1999 13:43:31 +0800 From: Peter Wemm <peter@netplex.com.au> To: Yoshinobu Inoue <shin@nd.net.fujitsu.co.jp> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: CVSROOT avail Message-ID: <19991105054331.141241C03@overcee.netplex.com.au> In-Reply-To: Your message of "Fri, 05 Nov 1999 14:11:32 %2B0900." <19991105141132W.shin@nd.net.fujitsu.co.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
Yoshinobu Inoue wrote: > > peter 1999/11/04 20:55:34 PST > > > > Modified files: > > . avail > > Log: > > Turn off src/sys commits until the kame disaster(?) is resolved, in case > > we have to restore the tree from backups.. > > Sorry... > > Or do I re-commit one older version for those merged files? > > Yoshinobu Inoue The reason I turned off commits is because I have (by coincidence) a complete snapshot of the tree about 10 minutes prior to the import, and having other people making changes while it's being sorted out makes things complicated. The problem with what happened was that 'cvs import' brings files onto the vendor branch, which is something that is inconsistantly used on our src/ sys tree. Large chunks have the UCB CSRG releases on the vendor branches, others have other people's releases on vendor branches, some don't have branches at all, and some use rev 1.1.2 instead of 1.1.1 as the current vendor release. Importing something else globally onto the 1.1.1 branch causes a fairly major disruption to the sequence of vendor files there. For KAME-supplied files, then yes, an import is exactly the right thing to do and it enables simple tracking of KAME releases. However, for files that KAME has had to patch, 'cvs import' is not the tool to use. The netinet6 and altq etc files are now present in -current as a result of the import. This is not the end of the world, but it would have caused problems down the track if left as it is. I'd like to get it fixed so it is done properly and will serve us best. Cheers, -Peter 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?19991105054331.141241C03>