35 lines
1.3 KiB
Plaintext
35 lines
1.3 KiB
Plaintext
|
##############################################################################
|
||
|
|
Here are generic CVS server instructions:
|
||
|
|
|
||
|
|
(1) Get an SSH Public key installed on cvs.am-utils.org. You can generate a
|
||
|
|
public/private key pair using ssh-keygen(1). Then copy the key into
|
||
|
|
your ~/.ssh/authorized_keys file on cvs.am-utils.org. If you don't have
|
||
|
|
login access on cvs.am-utils.org, then email
|
||
|
|
am-utils-developers@am-utils.org.
|
||
|
|
|
||
|
|
(2) Then, check out a fresh copy of 6.1 (experimental)
|
||
|
|
|
||
|
|
$ export CVS_RSH=ssh
|
||
|
|
$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout am-utils
|
||
|
|
|
||
|
|
Or, to checkout the stable branch:
|
||
|
|
|
||
|
|
$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-0-stable am-utils
|
||
|
|
|
||
|
|
(3) Then you can do normal edit, commit, update, etc. without having to
|
||
|
|
worry about your $CVSROOT or the -d option. Just remember to keep
|
||
|
|
setting CVS_RSH=ssh in your environment (or put it in your
|
||
|
|
.profile/.login file).
|
||
|
|
|
||
|
|
##############################################################################
|
||
|
|
To merge changes from the stable branch into the main (experimental) branch:
|
||
|
|
|
||
|
|
$ cvs update -j amd-6-0-stable -kk
|
||
|
|
|
||
|
|
- don't worry about all the files that change; it's probably because of cvs
|
||
|
|
keywords in the sources
|
||
|
|
|
||
|
|
- after the merge, do a 'cvs update -d' and resolve any conflicts
|
||
|
|
|
||
|
|
##############################################################################
|