Date: Wed, 28 Feb 1996 00:31:29 +0800 From: Peter Wemm <peter@jhome.DIALix.COM> To: Bruce Evans <bde@zeta.org.au> Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-lib@freefall.freebsd.org, pst@freefall.freebsd.org Subject: Re: cvs commit: src/lib/libc/db - Imported sources Message-ID: <199602271631.AAA20908@jhome.DIALix.COM> In-Reply-To: Your message of "Wed, 28 Feb 1996 01:53:38 %2B1100." <199602271453.BAA03186@godzilla.zeta.org.au>
next in thread | previous in thread | raw e-mail | index | archive | help
>> src/lib/libc/db - Imported sources >> Update of /home/ncvs/src/lib/libc/db >> In directory freefall.freebsd.org:/a/pst/db.1.85 >> >> Revision/Branch: 1.1.1 >> >> Log Message: >> Import updated Berkeley DB into CSRG branch > >This breaks everything that hasn't moved off the CSRG branch. >E.g., the current btree.h changed and it is now inconsistent with >the current bt_close.c which didn't change. > >Bruce The include/db.h and include/mpool.h update was botched too. I'm a few minutes away from finishing a 'make world' after attempting to repair it. I'll commit it in a moment. Just a reminder for everybody out there.. Importing stuff has potentially serious consequences if you are not aware of what is going to happen. If a file was imported back when the 4.4Lite tree was built and NEVER touched, it is "still on the vendor branch". Ie: it is checked out with revision 1.1.1.1 or 1.1.1.2 etc. If you import a new version into the tree, the vendor branch is updated, and all the files that are still connected to it spontaniously updated. However, If a file has left the vendor branch and started on the mainline, doing an import only updates the vendor branch. You have to go to each and every changed file and manually merge the changes onto the mainline. What Paul has done is import new code onto the vendor branch. 90% of the db files were still on the vendor branch, and 10% had been modified (whitespace, fixes, and thread-safe updates). Those 10% of the files were still at the db.1.73 level, while the unmodified 90% were now at db.1.85 level. The internal interfaces have changed significantly, preventing a compile. The entire kernel is off the vendor branch, so imports there are harmless. However, 90% of the user-mode code is still at 4.4Lite vendor level. This is why we cannot "trivially" import lite-2. It would take a week to get the tree to compile again and probably longer to fix the mysterious problems. And what Paul did in the include directory is *definately* off limits. Committing onto the vendor branch directly will cause me to dust off the baseball bat that I inherited from Rod Grimes, and start aiming for people's kneecaps. The "only" way to get stuff on the vendor branch is with 'cvs import'. Fair warning to all... (Nothing personal against Paul here.. I'm merely stating the position I intend to take) Cheers, -Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199602271631.AAA20908>