[parisc-linux] CVS rumors

[Paul Bame]

= True, but in the absence of a working date + branch checkout, it's a
= reasonable interim solution (real solution is to fix cvs).

There's another "solution".  date+branch checkout works on other branches
just not on the trunk :-)  One idea I propose for discussion is moving
development from the trunk to a branch so in the future we could do
date+branch checkouts.  We'll soon have 2 development branches
(2.4.x and 2.5.x) so we'll all need to learn to use a few more CVS
features anyway.

As for fixing CVS, there was no reply to my cvs bugs e-mail containing
the ultra-simple test case showing that HEAD+date checkouts don't work.

= I don't know of any way to get rid of the vendor branch taint other than
= using 'cvs admin -b' or (less preferably) rcs directly.

Unfortunately if you're actually using the CVS default branch feature,
safe-cvsimport's 'cvs admin -b' will make you unhappy :-)

The other option is to never use cvs import -- rather late for
us though there are some arguments for archiving the old repository
and reinitializing -- especially just prior to 2.5 kernels.

= Ouch.  The import should have some distinct tag, and I guess using a
= date tag is the best you'll get for trying to determine the state prior
= to the merge (which, according to Murphy's Law, I predict overlapped
= regular development).  My best advice is "don't do that then".

Fortunately by diffing against Linus' tree, willy tends to catch the
fallout from the mixed imports which we don't catch while manually
resolving merges.

	-P