Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr

diff --git a/mr b/mr
index f769eff461ef8241a09679c18682540412a225f3..530f2e0f6ad2206f766deda6f74440fe26069918 100755 (executable)
--- a/mr
+++ b/mr
@@ -356,9 +356,9 @@ sub loadconfig {
        }
 }
 
-__DATA__
-# Some useful actions that mr knows about by default.
+# Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
+__DATA__
 [default]
 update = \
        if [ -d .svn ]; then \

diff --git a/mrconfig b/mrconfig
index 44d6d8ea01b534d538aa49f6aeca1db9a97ceaff..5635ec012b2b8fe3d37261ec33ea84490f124139 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -21,3 +21,9 @@ 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
+
+# Teach mr how to run svn cleanup.
+[default]
+cleanup = if [ -d .svn ]; then svn cleanup ; fi