git clone ssh://uhlig@lxetch32.gsi.de/misc/uhlig/GIT/cbmroot

git pull to get changes

git push to commit changes

commits to svn should only be done from GSI machine

Working with GIT, SVN and gitorious

After i messed up the first version of the git repository due to unresolvable differences between the gitorious repository and the working copy which was used to synchronize git with svn I cam to the conclusion that it is better to use the synchronization repository only for synchronization. In the first version I did also the work (edit, new branches, merges and so on) in this directory. In the following I will document how I setup the second version and how the workflow looks like.

The synchronization repositories between the SVN repository and gitorious@gsi is on demac006 at ~/GIT This directory should be only used to fetch the latest updates from SVN, push them to gitorious and maybe after merging (done from another working directory) fetch the new version from gitorious and dcommit them to SVN. All the other git repositories should be synchronized with the gitorious repository at gsi.

Setup a new git repository on gitorious@GSI

• Check out a new git repository from the central SVN repository
  • git svn clone https://subversion.gsi.de/fairroot/fairbase/release fairbase

• Add the gitorious repository as path to push changes
  • git remote add origin git@gitorious.gsi.de:fairroot-development/fairroot-development.git

• Create the gitorious repository by pushing the data
  • git push origin master

Create a new git working directory from gitorious@gsi

• Create a clone of the gitorious repository
  • git clone git@gitorious.gsi.de:fairroot-development/fairroot-development.git fairbase

• Add the gitorious repository as path to push changes (if necessary)
  • git remote add origin git@gitorious.gsi.de:fairroot-development/fairroot-development.git

• Create symbolic links for all the external dependencies (only needed for cbmroot, pandaroot and r3broot). Check on https://subversion.gsi.de/trac/fairroot/browser/cbmroot/trunk which external directories from fairbase are defined. For all of these directories create symbolic links
  • ln -s ../fairbase/base

• For pandaroot one also needs the genfit. Create somewhere a directory where all the genfit stuff is located. This is only a SVN repository. Then also create the symbolic links from inside pandaroot to the correct directories.
  • svn checkout -r 313 https://genfit.svn.sourceforge.net/svnroot/genfit/core genfit
  • svn checkout -r 216 https://genfit.svn.sourceforge.net/svnroot/genfit/LSLtrackRep LSLtrackRep
  • svn checkout -r 216 https://genfit.svn.sourceforge.net/svnroot/genfit/GeaneTrackRep2 GeaneTrackRep2
  • svn checkout -r 313 https://genfit.svn.sourceforge.net/svnroot/genfit/RKTrackRep RKTrackRep
  • ln -s ../genfit/genfit
  • cd GenfitTools/trackrep && ln -s ../../../genfit/LSLtrackRep && cd -
  • cd GenfitTools/trackrep && ln -s ../../../genfit/GeaneTrackRep2 && cd -
  • cd GenfitTools/trackrep && ln -s ../../../genfit/RKTrackRep && cd -

• For cbmroot one has to copy the required fieldmaps to the input directory.

Create a new branch for the development

To make things more easy for later merges it is best to do all the developments in a development branch. If the development is ready to go back to the SVN repository one has to merge the development branch into the master branch.

• git checkout -b branchname

-- FlorianUhlig - 18 May 2010