Information from Marco on how to keep the SVN and GIT code repositories in sync:
this is how I usually do it.
First you need a local clone:
git clone https://:@git.cern.ch/kerberos/gaudi Gaudi
cd Gaudi
git remote add gw /afs/cern.ch/sw/Gaudi/git/gateway/Gaudi
git fetch gw
Then you can do you changes and commit the to the master branch.
To push the changes to SVN, I usually do:
git push gw master:m
pushd /afs/cern.ch/sw/Gaudi/git/gateway/Gaudi
git checkout master
git fetch
git merge m
git branch -d m
git svn dcommit --use-log-author --add-author-from
git push
popd
git fetch
git rebase origin/master
At the moment I'm keeping the branches dev/no_reflex and (sometimes) dev/cmake
in sync with master. If that's the case, before the "git push" I also do:
git checkout dev/no_reflex
git merge --ff-only master
git checkout dev/cmake
git merge --ff-only master
git checkout master
If you have changes in SVN, the master should be updated:
cd /afs/cern.ch/sw/Gaudi/git/gateway/Gaudi
git svn fetch --use-log-author
git push
Cheers
Marco
--
BenjaminCouturier - 19 Mar 2014