linux bame

[bame@riverrock.org]

= On Thu, Nov 09, 2000 at 03:53:48PM -0700, Paul Bame wrote:
= >     Somebody never imported 2.4.0-test6, then I imported -test10 on the mai
n
= >     vendor branch and now can't (easily) undo that to import test6 and THEN
= >     test10.  This workaround sucks.
= 
= don't use vendor branches.  didn't you talk to mang about this?

Um, I have no information to go on from your note.  All the (successful)
merges I've done before have used the cookbook CVS merge method including
a vendor branch.  Several (N-1?) of the palinux merges have been
accompanied by updating the vendor branch.  And this merge is going
well despite the ugly workaround, or so it appears to me.  Just
importing files to a vendor branch should have no effect on anything
else unless CVS has some horrible bug (RCS does not).  Before I make
what is apparently a serious mistake ("don't use vendor branches" sounds
pretty serious) please enlighten me!

	-P