aboutsummaryrefslogtreecommitdiffstats
path: root/cvs-server.txt
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2015-01-28 22:55:06 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2015-01-28 22:55:06 +0000
commite925d4a747df4a349c2baac436a71f606945baa5 (patch)
treee3a2ccc21623f0453c6f43f9016535205ba10d21 /cvs-server.txt
parent509fcedcfec077a6070002f4059db0ae675be869 (diff)
downloadsrc-e925d4a747df4a349c2baac436a71f606945baa5.tar.gz
src-e925d4a747df4a349c2baac436a71f606945baa5.zip
amd: flatten the tree
Notes
Notes: svn path=/vendor/amd/dist/; revision=277863
Diffstat (limited to 'cvs-server.txt')
-rw-r--r--cvs-server.txt43
1 files changed, 43 insertions, 0 deletions
diff --git a/cvs-server.txt b/cvs-server.txt
new file mode 100644
index 000000000000..0943963082cb
--- /dev/null
+++ b/cvs-server.txt
@@ -0,0 +1,43 @@
+##############################################################################
+Here are generic CVS server instructions:
+
+(1) Login to the cvs server. Not needed more than once b/c the cvs login
+ will record your cvs password in $HOME/.cvspass. Change "ezk" for your
+ CVS user id.
+
+$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot login
+CVS password:
+
+Type in your password, crypt(3)'ed in /proj/bank/cvsroot/CVSROOT/passwd.
+
+(2) Then, check out a fresh copy of 6.1 (experimental)
+
+$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout am-utils
+
+Or, to checkout the stable branch:
+
+$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout -r amd-6-0-stable am-utils
+
+(3) Then you can do normal edit, commit, update, etc. w/o having to worry
+ about your $CVSROOT or the -d option.
+
+##############################################################################
+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
+
+##############################################################################
+
+There are two new mailing lists:
+
+amd-maintainers@shekel.mcl.cs.columbia.edu: for Amd maintainers to
+ communicate internally w/o exposure to the greater user community.
+
+amd-cvslog@shekel.mcl.cs.columbia.edu: to get cvs log messages. I've used a
+ better (I hope) script for loginfo. It provides different output
+ and can be tweaked as well.
+##############################################################################