From: bangerth Date: Sat, 30 Oct 2010 03:20:48 +0000 (+0000) Subject: Overhaul. Shorten. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae5e6c1594ed10e3e7118a4317016616b62c2af2;p=dealii-svn.git Overhaul. Shorten. git-svn-id: https://svn.dealii.org/trunk@22557 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/development/svn.html b/deal.II/doc/development/svn.html index da498b7f3f..a7fc319042 100644 --- a/deal.II/doc/development/svn.html +++ b/deal.II/doc/development/svn.html @@ -20,41 +20,41 @@ The root of the deal.II archive is located at http://www.dealii.org/svn/dealii/. - There, we can find three subdirectories: + There are three subdirectories:

Creating a development branch

- When starting new developments which cannot be checked in in a - single sweep, it is advised to create a development branch. In order - to keep this branch up-to-date with the trunk, the - program svnmerge can be used. Such a branch is created in - the following steps: + Significant new functionality can often not 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 svnmerge 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