From: martin f. krafft <madduck@madduck.net>
Date: Sun, 18 May 2008 13:37:48 +0000 (+0200)
Subject: fix migration to hack branch setup
X-Git-Url: https://git.madduck.net/etc/myrepos.git/commitdiff_plain/f9e5b47e127d5c1d5a0caacf9b97b0c427551cbe?ds=sidebyside

fix migration to hack branch setup
---

diff --git a/.mr/base b/.mr/base
index 8c45a41..13f48c2 100644
--- 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]