better cvs handling approach

[code/myrepos.git] / mrconfig

diff --git a/mrconfig b/mrconfig
index aff6a913e76ef7a3562d16b0dcdee6a22d5d36ff..e4ae9a0887448f2239bdfffdbf6105aa91d037f8 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -10,16 +10,31 @@ skip = test $(hostname) != kodama
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.

-checkout = git clone git://git.debian.org/git/dpkg/dpkg.git && \
+checkout = \
+       git clone git://git.debian.org/git/dpkg/dpkg.git && \

        cd dpkg && \
        git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
        git fetch kite && \
        git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3
        cd dpkg && \
        git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
        git fetch kite && \
        git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3

+commit = git push kite
+
+[html/www.debian.org]
+# Still in CVS..urk!
+checkout = \
+       CVSROOT=:ext:joeyh@cvs.debian.org:/cvs/webwml \
+       cvs co -d www.debian.org webwml
+# cvs sucks sufficiently that I prefer to run these commands by hand,
+# and only rarely
+update = echo "skipping cvs update (too slow)"
+status = echo "skipping cvs status (too ugly)"

 
 # My home directory, which I keep in svn.
 []
 
 # My home directory, which I keep in svn.
 []

-# Since I have a lot of different branches for different machines,
-# the checkout procedure is manual.
-checkout = echo "run svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-<branch> ."; \
-       exit 1
+checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey
+# run svnfix after each update
+update = svn update && svnfix
+
+[default]
+# Teach mr how to run svn cleanup.
+cleanup = if [ -d "$MR_REPO"/.svn ]; then svn cleanup ; fi