From: Joey Hess Date: Thu, 18 Oct 2007 21:30:44 +0000 (-0400) Subject: Merge branch 'master' into mrconfig_bestguess X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/4c155e72e66ff5d1122b4c9f583514725308ad04?ds=sidebyside Merge branch 'master' into mrconfig_bestguess --- 4c155e72e66ff5d1122b4c9f583514725308ad04 diff --cc mr index 14f4165,53f7a06..19c29aa --- a/mr +++ b/mr @@@ -893,8 -894,17 +902,17 @@@ register if [ -z "$url" ]; then error "cannot determine bzr url" fi - echo "Registering bzr url: $url" + echo "Registering bzr url: $url in $MR_CONFIG" mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir" + elif [ -d CVS ]; then + repo=$(cat CVS/Repository) + root=$(cat CVS/Root) + if [ -z "$root" ]; then + error "cannot determine cvs root" + fi + echo "Registering cvs repository $repo at root $root" + mr -c "$MR_CONFIG" config "$(pwd)" \ + checkout="cvs -d '$root' co -d $basedir $repo" else error "unable to register this repo type" fi