1*a53f50b9Schristos############################################################################## 2*a53f50b9SchristosHere are generic CVS server instructions: 3*a53f50b9Schristos 4*a53f50b9Schristos(1) Get an SSH Public key installed on cvs.am-utils.org. You can generate a 5*a53f50b9Schristos public/private key pair using ssh-keygen(1). Then copy the key into 6*a53f50b9Schristos your ~/.ssh/authorized_keys file on cvs.am-utils.org. If you don't have 7*a53f50b9Schristos login access on cvs.am-utils.org, then email 8*a53f50b9Schristos am-utils-developers@am-utils.org. 9*a53f50b9Schristos 10*a53f50b9Schristos(2) Then, check out a fresh copy of 6.2 (development branch) 11*a53f50b9Schristos 12*a53f50b9Schristos$ export CVS_RSH=ssh 13*a53f50b9Schristos$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout am-utils 14*a53f50b9Schristos 15*a53f50b9Schristos Or, to checkout the stable branch: 16*a53f50b9Schristos 17*a53f50b9Schristos$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-1-stable am-utils 18*a53f50b9Schristos 19*a53f50b9Schristos Or, to checkout the legacy branch: 20*a53f50b9Schristos 21*a53f50b9Schristos$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-0-stable am-utils 22*a53f50b9Schristos 23*a53f50b9Schristos(3) Then you can do normal edit, commit, update, etc. without having to 24*a53f50b9Schristos worry about your $CVSROOT or the -d option. Just remember to keep 25*a53f50b9Schristos setting CVS_RSH=ssh in your environment (or put it in your 26*a53f50b9Schristos .profile/.login file). 27*a53f50b9Schristos 28*a53f50b9Schristos############################################################################## 29*a53f50b9SchristosTo merge changes from the stable branch into the main (development) branch: 30*a53f50b9Schristos 31*a53f50b9Schristos$ cvs update -j amd-6-1-stable -kk 32*a53f50b9Schristos 33*a53f50b9Schristos- don't worry about all the files that change; it's probably because of cvs 34*a53f50b9Schristos keywords in the sources 35*a53f50b9Schristos 36*a53f50b9Schristos- after the merge, do a 'cvs update -d' and resolve any conflicts 37*a53f50b9Schristos 38*a53f50b9SchristosNevertheless, please exercise caution when merging branches. 39*a53f50b9Schristos 40*a53f50b9Schristos############################################################################## 41