Overview

This guide is intended for PCMDI software developers and external collaborators who contribute to CDAT. It provides a brief introduction to get/put changes between branches.
A VERY good help about integration and svn can be found here

Getting changes from the "trunk" into your branch (ziri here)

from the "ziri" directory do:

svn --dry-run merge -rx:HEAD http://www-pcmdi.llnl.gov/svn/repository/cdat/trunk .

Where x is last time you merged from trunk, put this value in commit text. Use '--dry-run' to see what would happen if you actualy would perform the merging, this option doesn't apply local changes to the working directory. Skip the '--dry-run' and run the comand again to do the merging.

Use svn commit to finalize the operation.

svn commit

This prompts me for a log message, using the text editor specified in my EDITOR environment variable.

Getting changes from the "ziri" branch into the trunk

from the "trunk" directory do:

svn --dry-run merge -rx:HEAD http://www-pcmdi.llnl.gov/svn/repository/cdat/branches/ziri .

where x is the last time you merged from your branch ("ziri" here), remember to put the x number in the comments.

Use svn commit to finalize the operation.

svn commit

This prompts me for a log message, using the text editor specified in my EDITOR environment variable.

Note on finding the right value of "x"

svn log -v

You can use the the revision number of that commit to use as the next time "x"

More Subversion Documentation

http://svnbook.red-bean.com/en/1.1/svn-book.html