Need -d switch when specifying cvsroot on the command line. = -> := prevents infinite recursion later if we overload the branch. Index: client.mk =================================================================== RCS file: /cvsroot/mozilla/client.mk,v retrieving revision 1.52 diff -u -r1.52 client.mk --- client.mk 1999/04/26 21:47:47 1.52 +++ client.mk 1999/04/27 15:01:54 @@ -77,11 +77,11 @@ CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null) ifneq ($(CVS_ROOT_IN_TREE),) ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT)) - CVS_FLAGS := $(CVS_ROOT_IN_TREE) + CVS_FLAGS := -d $(CVS_ROOT_IN_TREE) endif endif -CVSCO = cvs $(CVS_FLAGS) co $(CVS_CO_FLAGS) +CVSCO := cvs $(CVS_FLAGS) co $(CVS_CO_FLAGS) CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log ####################################

Thanks for the patch. Oops, I forgot the '-d' flag. I'll add that. As for $(CVSCO), it needs to have "recursive expansion" so that client.mk can checkout mozconfig2defs.sh and find-mozconfig.sh before it reads the client.mk options. (Chicken and egg problem.) To avoid the infinite loop, I'll change the way the branch and date flags get added. Index: client.mk =================================================================== RCS file: /cvsroot/mozilla/client.mk,v retrieving revision 1.52 diff -r1.52 client.mk 39d38 < # also, 80c79 < CVS_FLAGS := $(CVS_ROOT_IN_TREE) --- > CVS_FLAGS := -d $(CVS_ROOT_IN_TREE) 121c120 < CVSCO := $(CVSCO) -r $(MOZ_CO_BRANCH) --- > CVS_CO_FLAGS := $(CVS_CO_FLAGS) -r $(MOZ_CO_BRANCH) 125c124 < CVSCO := $(CVSCO) -D "$(MOZ_CO_DATE)" --- > CVS_CO_FLAGS := $(CVS_CO_FLAGS) -D "$(MOZ_CO_DATE)"

I checked in my patch.

In case you are interested, here is a handy shell function I use to switch between CVS roots. CVSROOT_LIST=" gila :pserver:$USER%netscape.com@gila.mozilla.org:/cvsroot mozilla :pserver:$USER%netscape.com@cvs.mozilla.org:/cvsroot gnome :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome " function cvsroot() { echo $CVSROOT_LIST | perl -n -e 'chomp; @root_list = split / /; %rootname = reverse @root_list; print "\n"; for ($ii=1; $name = shift @root_list and $root = shift @root_list; $ii++) { printf "%2d. %-10s %s\n", $ii, $name, $root; } print "\nPlease select root [".$rootname{$ENV{CVSROOT}}."]: ";' read _root_num echo _root_cmd=`echo $CVSROOT_LIST | perl -n -e 'chomp;$root_num="'"$_root_num"'"; @root_list = split / /; print "CVSROOT=$ENV{CVSROOT}" if $root_num eq ""; print "CVSROOT=@root_list[$root_num*2-1]" if $root_num ne "";'` echo $_root_cmd eval $_root_cmd }

ttt

(In reply to comment #4) > ttt sdfsdffsdfsfdsdfsdsdsfsfsfdsfsdfsdfsdfsdfsdsfdsdsdsdfsddsdsf