Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
| ||||||||
Line: 31 to 31 | ||||||||
| ||||||||
Added: | ||||||||
> > |
Create a new git working directory from gitorious@gsi | |||||||
Changed: | ||||||||
< < |
| |||||||
> > |
Create a new branch for the developmentTo 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. | |||||||
Changed: | ||||||||
< < |
| |||||||
> > |
| |||||||
-- FlorianUhlig - 18 May 2010 |
Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
| ||||||||
Line: 11 to 11 | ||||||||
Working with GIT, SVN and gitorious | ||||||||
Changed: | ||||||||
< < |
The repository where the connection between the SVN repository and gitorious@gsi is done is at
the demac006. Here one has to fetch the latest updates from SVN, push them to gitorious or in
the other direction fetch the latest updates from gitorious and dcommit them to SVN. All the
other git repositories should be synchronized with the gitorious repository at gsi.
| |||||||
> > | 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. | |||||||
Added: | ||||||||
> > |
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
| |||||||
Deleted: | ||||||||
< < | git svn clone https://subversion.gsi.de/fairroot/fairbase/release fairbase git remote add origin git@gitorious.gsi.de:fairroot-development/fairroot-development.git git push origin master | |||||||
Added: | ||||||||
> > |
| |||||||
Added: | ||||||||
> > |
| |||||||
-- FlorianUhlig - 18 May 2010 |
Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
| ||||||||
Line: 23 to 23 | ||||||||
Added: | ||||||||
> > | git svn clone https://subversion.gsi.de/fairroot/fairbase/release fairbase git remote add origin git@gitorious.gsi.de:fairroot-development/fairroot-development.git git push origin master | |||||||
Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
| ||||||||
Line: 8 to 8 | ||||||||
commits to svn should only be done from GSI machine | ||||||||
Added: | ||||||||
> > |
Working with GIT, SVN and gitoriousThe repository where the connection between the SVN repository and gitorious@gsi is done is at the demac006. Here one has to fetch the latest updates from SVN, push them to gitorious or in the other direction fetch the latest updates from gitorious and dcommit them to SVN. All the other git repositories should be synchronized with the gitorious repository at gsi.
| |||||||
-- FlorianUhlig - 18 May 2010 |