On Sat, 4 Mar 1995 13:25:51 -0600 (CST) 
 VaX#n8 <vax@ccwf.cc.utexas.edu> wrote:

 > They all have CVS dirs in them, so are not empty.  Is everyone just ignoring
 > these messages, or am I missing an option or something?

I don't sup into my CVS tree...I sup into a `clean' area (pure -current), 
and then `cvs import' automagically, with a tag automatically generated 
with the convention `current-month_day_year'.  I then do the following 
(well, this is what I'll do today...)

basalt (thorpej) /usr/src 101% cvs update -qd -jcurrent-March_4_1995

My tree at home usually requires ~10 manual merges (mostly makefiles due 
to some locally added yp stuff...).  At work, I have ~50 conflicts to 
resolve, but, even so, it only takes about 15-20 minutes, including the 
pouring of 2 cups of coffee...

'Course, this isn't exactly easy on disk space: 1 clean copy, 1 rcs-ized 
copy in $CVSROOT, and one checked-out copy.  But, I think it's just one 
of those trade-offs; this really gives me the flexibility I need...

--------------------------------------------------------------------------
Jason R. Thorpe                                       thorpej@nas.nasa.gov
NASA Ames Research Center                               Home: 408.866.1912
NAS: M/S 258-6                                          Work: 415.604.0935
Moffet Field, CA 94035                                 Pager: 415.428.6939