mozilla/client.mak does CVS checkouts but provides no way to specify a branch tag for them. This is proving to be a problem when working on the new M3 branch. client.mak should support MOZ_BRANCH. Here is a patch that seems to work for me: Index: client.mak =================================================================== RCS file: /cvsroot/mozilla/client.mak,v retrieving revision 3.36 diff -r3.36 client.mak 34a35,41 > # Figure out -r option to use (or not). > !if defined(MOZ_BRANCH) > CVS_BRANCH_OPT = -r $(MOZ_BRANCH) > !else > CVS_BRANCH_OPT = > !endif > 40c47 < CVSCO = cvs -d $(CVSROOT) -q co -P --- > CVSCO = cvs -d $(CVSROOT) -q co -P $(CVS_BRANCH_OPT) 42c49 < CVSCO = cvs -q co -P --- > CVSCO = cvs -q co -P $(CVS_BRANCH_OPT)

added logic to client.mak so that it supports MOZ_BRANCH or MOZ_DATE also recovered the error-handling and environment variable checking that is good to have.