GSI Forum: General » Subversion HOWTO

Home » PANDA » PandaRoot » General » Subversion HOWTO

Show: Today's Messages :: Polls :: Message Navigator

Subversion HOWTO [message #14865]

Tue, 18 June 2013 15:11

StefanoSpataro
Messages: 2736
Registered: June 2005
Location: Torino

first-grade participant

From: *to.infn.it

Dear all,
for all the people willing to use svn in a more advanced way, in the ROOT website you can find a nice howto under the following link:

http://root.cern.ch/drupal/content/subversion-howto

For instance, this could be helpful once you want to merge your own development branch.

Enjoy!

Report message to a moderator

Re: Subversion HOWTO [message #15206 is a reply to message #14865]

Wed, 14 August 2013 15:04

Stefan Pflueger
Messages: 99
Registered: February 2012

continuous participant

From: *kph.uni-mainz.de

Hi,

thx for the link. Just a small question for clarification. In order to do some development on a subpart of pandaroot, the whole pandaroot trunk has to be copied to your development directory in order to be able to build it out of the box. Or did I misunderstand something?

Best regards,

Stefan

Report message to a moderator

Re: Subversion HOWTO [message #15207 is a reply to message #15206]

Wed, 14 August 2013 15:14

StefanoSpataro
Messages: 2736
Registered: June 2005
Location: Torino

first-grade participant

From: 2.235.190*

I would say just the opposite,
you download the trunk, and you substitute the folders you are modifying with the development ones. When you have to commit your changes into the trunk, if I remember well you should use the merge command.
Florian is the svn expert...

Report message to a moderator

Re: Subversion HOWTO [message #15208 is a reply to message #14865]

Wed, 14 August 2013 15:20

Jens Sören Lange
Messages: 193
Registered: June 2005

first-grade participant

From: *wlan.uni-giessen.de

Hi, merge is correct.

http://panda-wiki.gsi.de/cgi-bin/view/Computing/PandaRootSvnDev2Trunk

Report message to a moderator

Re: Subversion HOWTO [message #15209 is a reply to message #15206]

Wed, 14 August 2013 15:24

Tobias Stockmanns
Messages: 489
Registered: May 2007

first-grade participant

From: *ikp.kfa-juelich.de

Hi Stefan,

Stefano is right.

1) Copy just the folder(s) you want to modify from trunk to your subfolder in the development branch inside the subversion system
2) Make a switch of this folder in your local copy
3) Work (and commit) now in the development branch until you think everything is done
4) Merge back your code into the trunk

Most of these things can be done easily in a development suite like Eclipse Smile