Merging and Updating the SVN Repository For Fortuna

This page will detail information about the SVN repository

Creating new branch

Copy trunk to new branch

First, svn copy the trunk (or another branch) into a new branch:

svn copy http://geos5.org/svn/trunk http://geos5.org/svn/branches/Fortuna-2_5_p6 -m "geos: created Fortuna-2_5_p6 branch"

Note that this is just a copy, so that means the Fortuna-2_5_p6 branch isn't actually Fortuna-2_5_p6 yet.

Checkout SVN version of new branch

cd /path/to/svn/directory
ls
branches/ tags/ trunk/
cd branches/
svn checkout http://geos5.org/svn/branches/Fortuna-2_5_p6

Copy new branch to a SAVE directory (optional)

This is a bit "belt-and-suspenders", but to be sure you don't muck up the "merge" from CVS to SVN, I made a copy of the new branch:

cp -a Fortuna-2_5_p6 Fortuna-2_5_p6-SAVE

Checkout a CVS copy of the new branch

The next step is to check out the tag that will become the new branch:

cd /path/to/cvs/directory
mkdir Fortuna-2_5_p6
cd Fortuna-2_5_p6
cvs co -r Fortuna-2_5_p6 Fortuna

Apply copyright to CVS code

Next, in the CVS branch, run the HandleCopyright.py script:

cd /path/to/model/directory/Fortuna-2_5_p6/GEOSagcm/src
HandleCopyright.py -p .

At the moment, we *think* the copyright script correctly handles all files, but the proof will be when you try and build the "copyrighted" code. The files that have the greatest chance of getting screwed up are .h files since some in the GEOS-5 GCM are .h files that contain C code (mainly in GFDL_fms) and most are .h files that contain Fortran code.

---

---

---

Miscellaneous SVN Activities

Merging Branches to the Trunk

Fortuna-2_5_p1 (revision 46) to Trunk (revision 5):

svn --username geos merge --reintegrate http://geos5.org/svn/branches/Fortuna-2_5_p1@HEAD

Diffing Two Directories Excluding the .svn Directory

diff -r --exclude=".svn" sub/dir/one sub/dir/two

Creating new tag

svn copy http://geos5.org/svn/trunk http://geos5.org/svn/tags/Fortuna-2_5_p1 -m "geos: create new tag"