From: Joey Hess <joey@dodo.kitenet.net>
Date: Thu, 11 Oct 2007 06:13:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/05b4b156dfab3c89cbf4652183f997ce6d78739a?hp=9107e4f2a67ca7f56ced7240bedaf90d479a85a0

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

diff --git a/mr b/mr
index f769eff..530f2e0 100755
--- 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 44d6d8e..5635ec0 100644
--- 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