HowTo create a stable revision in SVN
On the repository server create the new relase branch as a copy the trunk branch.
svn copy
https://subversion.gsi.de/cbmsoft/cbmroot/trunk
https://subversion.gsi.de/cbmsoft/cbmroot/release/FEB16
-m"Release branch Feb16"
Checkout the new release version of CBMROOT.
svn co
https://subversion.gsi.de/cbmsoft/cbmroot/release/FEB16
cbmroot_feb16
Enter directory
cd cbmroot_feb16
Change the properties of the external packages to the same revision
svn propedit svn:externals .
In the editor you have to add the revision to all line that means
KF/KFParticle
https://subversion.gsi.de/fairroot/cbmroot/development/mzyzak/KFParticle/KFParticle
has to be changed to
KF/KFParticle -r 28936
https://subversion.gsi.de/fairroot/cbmroot/development/mzyzak/KFParticle/KFParticle
There are also externals defined in the following directories
externals
test
Commit the changes to the server.
svn commit -m'Fix versions of external svn repositories.'
HowTo merge changes from the trunk in the release branch
If not existing, checkout a version of the release branch.
svn co
https://subversion.gsi.de/cbmsoft/cbmroot/release/FEB16
cbmroot_feb16
Enter directory
cd cbmroot_feb16
Merge the needed commits from the trunk branch.
svn merge -c 9551
https://subversion.gsi.de/cbmsoft/cbmroot/trunk
Redo the previous step for all needed commits.
Commit the changes back to the server
svn commit -m"Backport revisions 9551 and 9552. Closes #3456."
--
FlorianUhlig
- 01 Mar 2016
This topic: Homepages
>
HomepageFlorianUhlig
>
SvnFlorianUhlig
Topic revision:
2017-06-30,
FlorianUhlig
Copyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding CBM Wiki?
Send feedback
Imprint (in German)
Privacy Policy (in German)