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