Merge in master changes before commiting.
[socialgit.git] / cvs2git-modmerge.sh
blob309f6abff35ff7b3858dbec94014cb185d6c4c45
1 #!/bin/sh
3 rm -fr /tmp/cvs2git.tmp
4 cd $HOME
5 mkdir $2
6 cd $2
7 git --bare init --shared
8 CVSROOT=$1
9 GITLOCATION=`pwd`
11 for dir in `modules-in-cvs`; do
12 mkdir /tmp/cvs2git.tmp.$dir
13 cd /tmp/cvs2git.tmp.$dir
14 git cvsimport -o master -v -d $CVSROOT $dir
15 mkdir _tmp
16 git add _tmp
17 echo "creating tempdir to move sub-project $dir into." | git commit -a -F -
18 git mv [A-Za-z0-9]* _tmp/
19 git mv _tmp $dir
20 echo "moving $dir into place for merger." | git commit -a -F -
21 echo "pushing $dir..."
22 git pull $GITLOCATION master
23 git push $GITLOCATION master
24 echo "pushed $dir."
25 done