From 3a589de6a8a93faed18fde1ab88a5ab79cca5d8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 20 Apr 2011 23:03:21 +0200 Subject: [PATCH] NO_RSYNC variable, fix import commit number. --- cvs2git-inc.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cvs2git-inc.sh b/cvs2git-inc.sh index 25a7d3f..bb98aaf 100755 --- a/cvs2git-inc.sh +++ b/cvs2git-inc.sh @@ -22,17 +22,19 @@ # ==== import ==== -# sync (fetch) files into jra1mw.cvs -./cvssync.sh +if [ -z "$NO_RSYNC" ]; then + # sync (fetch) files into jra1mw.cvs + ./cvssync.sh -# sync fetched CVS repo to one-module CVS repo -rsync --archive --verbose jra1mw.cvs/ jra1mw-cvssync.cvs/jra1mw/ + # sync fetched CVS repo to one-module CVS repo + rsync --archive --verbose jra1mw.cvs/ jra1mw-cvssync.cvs/jra1mw/ -# import! -[ -d "jra1mw-cvssync.git/.git" ] || (echo "First run! Initial cvs2svn import must be done manually (although 'git cvsimport' will import something too)." && exit 1) -unset CVSROOT -echo "git cvsimport..." -git cvsimport -d `pwd`/jra1mw-cvssync.cvs -C jra1mw-cvssync.git -a -k -z30 -A authors.txt jra1mw + # import! + [ -d "jra1mw-cvssync.git/.git" ] || (echo "First run! Initial cvs2svn import must be done manually (although 'git cvsimport' will import something too)." && exit 1) + unset CVSROOT + echo "git cvsimport..." + git cvsimport -d `pwd`/jra1mw-cvssync.cvs -C jra1mw-cvssync.git -a -k -z30 -A authors.txt jra1mw +fi # firsttime setup for incremental sync if [ ! -d "jra1mw-transfer/.git" ]; then @@ -60,7 +62,7 @@ branch_RC31_3 4316f8ac93d4cfa61b471676c2f81e70f62f1b69 branch_2_0 385a0a242b5e4666192f1198df92d7d451c79164 branch_2_1 46021c94148d9d688604bcdbec0344e946d70053 branch_workflow a0a362418b99167f40d1328ea8a934b147372329 -master 5b654e485855b69a87a68a5a7ba82364b197cb7e" | while read branch start; do +master 2ef3e3661369d1c14713c237b54b62f8f802926b" | while read branch start; do echo "$start..cvssync/$branch" git checkout $branch || break cl=`git log --format='%ct %H' $start..cvssync/$branch -- | grep -v '\(e6919c\|1f39df\|1f39df\)' | sort -n | cut -f2 -d' '` -- 1.8.2.3