fix migration to hack branch setup

diff --git a/.mr/base b/.mr/base
index 8c45a41513a5c82a43deef5b5580f1a0da59ce62..13f48c28138ca2e9b3d26ed941c2f2222c690f9c 100644 (file)
--- a/.mr/base
+++ b/.mr/base
@@ -19,15 +19,22 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net
 
 [code/mr]
 checkout = checkout_hack_branch mr \
-       joeyh git://git.kitenet.net/mr \
-       ssh://git.madduck.net/~/git/pub/code/mr.git
-       ln -fs ../code/mr/mr ~/.bin/mr
-       git branch vcsh origin/vcsh
-update = case "$(git config --get remote.origin.url)" in \
-            *git.madduck.net*) git pull "$@";; \
-            *) git remote add joeyh git://git.kitenet.net/mr; \
-               git remote update; \
-               git branch joeyh joeyh/master;; \
+        joeyh git://git.kitenet.net/mr \
+        ssh://git.madduck.net/~/git/pub/code/mr.git
+        ln -fs ../code/mr/mr ~/.bin/mr
+        git branch vcsh origin/vcsh
+update = case "$(git config --get remote.origin.url)" in
+           *git.madduck.net*) git pull "$@";;
+           *) git remote add joeyh git://git.kitenet.net/mr
+              git fetch joeyh
+              git checkout -b joeyh joeyh/master
+              git branch -d master
+              git remote rm origin
+              git remote add origin ssh://git.madduck.net/~/git/pub/code/mr.git
+              git fetch origin
+              git branch master origin/master
+              git checkout -b vcsh origin/vcsh
+              ;;
          esac
 
 [code/mrsetup]