Documentation of the deal.II SVN Archive

The global structure

The root of the deal.II archive is located at https://svn.dealii.org/. There are three subdirectories:

Creating a development branch

Significant changes in the library often cannot be developed all at once. In a case like this, one can create a development branch in the subversion repository into which one can check in all necessary changes and from which one can merge the final set of changes into the main development line once ready. The svn program can be used to keep your branch up-to-date with the trunk.

Creating a branch works through the following steps:

  1. Create the branch using
    $ svn copy https://svn.dealii.org/trunk/ https://svn.dealii.org/branches/new-branch-name
    
  2. Either check out the new branch or switch your working copy by
    $ svn switch https://svn.dealii.org/branches/new-branch-name
    
    This command assumes you are in the top level directory, the one containing deal.II and tests
  3. After some development of the branch, if you want to merge changes that have been made on mainline in the meantime, you can use this command:
    $ svn merge ^/trunk
    
    This command will only run if you have no local changes in your working directory for the branch, and will modify all of your files by merging the changes made on mainline. If there are no conflicts that need to be resolved, you can simply commit the result.


The deal.II Authors $Date: 2013-11-28 18:07:17 -0500 (Thu, 28 Nov 2013) $
Valid HTML 4.01! Valid CSS!