move mr registration to base file, not LIB

diff --git a/.mr/LIB b/.mr/LIB
index 3eed5484801b07622d94e03290cb8a59f767e542..6c20d29f7009bb9719fda5d0d48388b53a81e8a6 100644 (file)
--- a/.mr/LIB
+++ b/.mr/LIB
@@ -21,9 +21,3 @@ lib =    checkout_hack_branch() {
             git push origin --all
           fi
         }
             git push origin --all
           fi
         }

-
-[code/mr]
-checkout = checkout_hack_branch mr \
-       joeyh git://git.kitenet.net/mr \
-       ssh://git.madduck.net/~/git/pub/code/mr.git
-       ln -s ../code/mr/mr ~/.bin/mr

diff --git a/.mr/base b/.mr/base
index b34da74587fab512a78b4d6bbd252fcdb34dce4e..b640106e1d291b82432d4f37b4bc1d8d2cd7871e 100644 (file)
--- a/.mr/base
+++ b/.mr/base
@@ -16,3 +16,13 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net
 
 [.fgits/screen.git]
 checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/screen.git' 'screen.git' '../../'
 
 [.fgits/screen.git]
 checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/screen.git' 'screen.git' '../../'

+
+[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
+
+[code/mrsetup]
+checkout = git clone ssh://git.madduck.net/~/git/pub/etc/mrsetup.git mrsetup