-- RobRoyFletcher - 16 May 2014

Some Notes on Using SVN

Location of egammaCore and genericUtils


Make a new development branch.

To make a new development branch you should copy the trunk to a new location. This will preseve all of the previous changeset info allowing svn to know what parent the branch came from. svn will then know how to properly merge these branches. To get your development first check out a copy of the trunk:
svn co svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/trunk ./PACKAGE
Then copy the repository to a new branch:
svn copy svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/trunk svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/branches/dev-PACKAGE -m 'Copying a new development branch'
Then in the directory that the trunk is in you can do:
svn switch svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/branches/dev-PACKAGE 
This will change the local working copy to be tracking the new branch. All file in your local copy will change to look however they look in the branch (which if this is a fresh copy will be identical to the trunk). Now you can make all of your edits and commit as normal. All commits will go into your branch and not the trunk.

Merging and Reintegrating

You should often sync with the trunk. this is done by running:
svn merge svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/trunk
This will take all changes made in the trunk and merge them into your branch. This will make reintegrating with the trunk much easier in the future. You can always switch back to the trunk as well if you need to make any changes there but dont want to effect your branch.

Once all of your changes have been made to your branch you can merge them into the trunk. Do do this, switch back to the trunk of the repo with

svn switch svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/trunk
Then merge the changes back in with:
svn merge --reintegrate svn+ssh://svn.cern.ch/reps/penn/fletch/PACKAGE/branches/dev-PACKAGE 
Now all of your work has been put into the trunk.
Edit | Attach | Watch | Print version | History: r4 < r3 < r2 < r1 | Backlinks | Raw View | WYSIWYG | More topic actions
Topic revision: r4 - 2015-07-02 - RobRoyFletcher
    • Cern Search Icon Cern Search
    • TWiki Search Icon TWiki Search
    • Google Search Icon Google Search

    Sandbox All webs login

This site is powered by the TWiki collaboration platform Powered by PerlCopyright & 2008-2020 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
or Ideas, requests, problems regarding TWiki? use Discourse or Send feedback