Always ensure all parent .mrconfig files are loaded

[code/myrepos.git] / mrconfig

diff --git a/mrconfig b/mrconfig
index 5c1d8c239ab7bab75395475a1f8e3867a546b9bd..a1abcd159e0be0279c11f7ba76f4b21dbfc2756b 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -1,29 +1,12 @@
-# An example config file for the mr(1) command.
+# A simple example config file for the mr(1) command.
 
-[src/mr]
-checkout = git clone ssh://kitenet.net/srv/git/kitenet.net/mr
+[mr]
+checkout = git clone git://git.kitenet.net/mr
 
-[src/linux-2.6]
+[linux-2.6]
 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-# I only check this out on kodama, otherwise skip it.
-skip = test $(hostname) != kodama
+# only update once every 12 hours
+skip = ([ "$1" = update ] && ! hours_since "$1" 12)
 
-[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 && \
-       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
-
-# My home directory, which I keep in svn.
-[]
-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
+[debian-cd]
+checkout = svn co svn://svn.debian.org/debian-cd/trunk debian-cd