more failproof mr hack branch switch

diff --git a/.mr/base b/.mr/base
index 13f48c28138ca2e9b3d26ed941c2f2222c690f9c..df43f756bcdb026e41a43cd93551915f4c2914a8 100644 (file)
--- a/.mr/base
+++ b/.mr/base
@@ -25,11 +25,11 @@ checkout = checkout_hack_branch 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 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 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