tag:blogger.com,1999:blog-8260739278874294486.post7269789305205648456..comments2021-12-16T15:28:31.042-08:00Comments on Tsuna's blog: git cvs in 5mintsunahttp://www.blogger.com/profile/06114951663056205324noreply@blogger.comBlogger2125tag:blogger.com,1999:blog-8260739278874294486.post-18627939405940574902008-12-13T16:43:00.000-08:002008-12-13T16:43:00.000-08:00You state that to update the working copy with the...You state that to update the working copy with the latest cvs entries, to do:<BR/><BR/> git checkout origin<BR/> git merge master<BR/><BR/>Now I'm new to this, so I might be wrong, but it seems to me that it should be:<BR/><BR/> git checkout master<BR/> git merge origin<BR/><BR/>as "git merge X" takes the changes from X and applies them to the current branch, and in this case we want from cvs branch "origin" to working directory "master".<BR/><BR/>Here are two shell scripts I created. Thanks for the help!<BR/><BR/>- - - update-git.sh - - -<BR/>git-cvsimport -v -C ../git-project<BR/>cd ../git-project<BR/>git checkout master<BR/>git merge origin<BR/><BR/>- - - export-commits.sh - - -<BR/>for i in `GIT_DIR=../git-project/.git git-cherry origin master | sed -n 's/^+ //p'`; do echo Exporting $i; GIT_DIR=../git-project/.git git-cvsexportcommit -c -p -v $i || break; doneAnonymousnoreply@blogger.comtag:blogger.com,1999:blog-8260739278874294486.post-86168086073706212762008-03-21T16:29:00.000-07:002008-03-21T16:29:00.000-07:00Thanks for the useful info - was very helpful.Thanks for the useful info - was very helpful.Naitik Shahhttps://www.blogger.com/profile/04873401819685593104noreply@blogger.com