Merge commit 'madduck/master'

[code/myrepos.git] / mrconfig.complex

diff --git a/mrconfig.complex b/mrconfig.complex
index f8ec25c2d30c6dfd85f39ab0d9233f73e84a0d27..2d566c3ccb92cc94d4c31d9c1ce2c40ac2e6bc14 100644 (file)
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -11,9 +11,9 @@ gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi
 push = if [ -d "$MR_REPO"/.git ]; then git push; fi
 # And how to list tags for git and svn.
 tag = 
 push = if [ -d "$MR_REPO"/.git ]; then git push; fi
 # And how to list tags for git and svn.
 tag = 

-       if [ -d "$MR_REPO"/.svn ]; then
-               git tag
-       elsif [ -d "$MR_REPO"/.git ]; then
+       if [ -d "$MR_REPO"/.git ]; then
+               git tag -l
+       elsif [ -d "$MR_REPO"/.svn ]; then

                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                svn ls "$(echo '$url' | sed -e 's/trunk/tags/')"
        else
                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                svn ls "$(echo '$url' | sed -e 's/trunk/tags/')"
        else


@@ -104,6 +104,16 @@ update = svn update && svnfix
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
 skip = ! private
 
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
 skip = ! private
 

+# I don't keep my music in revision control, but mr can be taught to use
+# unison to synchronise it.
+[sound]
+checkout = unison -batch sound
+update = unison -batch sound
+commit = unison sound
+skip = ! wantmedia
+# Update this last of all.
+order = 100
+

 # Example of how to remember to delete a repo, when one mrconfig file is
 # used on multiple systems. If you're feeling brave, use rm -rf $MR_REPO
 # instead. This approach can also be used for renames.
 # Example of how to remember to delete a repo, when one mrconfig file is
 # used on multiple systems. If you're feeling brave, use rm -rf $MR_REPO
 # instead. This approach can also be used for renames.