From: Matthias Maier Date: Mon, 21 Jul 2014 16:25:25 +0000 (+0200) Subject: Documentation: Remove svn.html from offline documentation X-Git-Tag: v8.2.0-rc1~3^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df28af545f60489cfd333196144d6442a248aa9e;p=dealii.git Documentation: Remove svn.html from offline documentation The new development guidelines for git should be prominently on the homepage, not buried in the offlinedocumentaiton. So just remove the old cruft. --- diff --git a/doc/developers/navbar.html b/doc/developers/navbar.html index af077e9ed3..2999fe8345 100644 --- a/doc/developers/navbar.html +++ b/doc/developers/navbar.html @@ -29,7 +29,6 @@ Development

- SVN Archive
CMake internals
Writing documentation
Porting
diff --git a/doc/developers/svn.html b/doc/developers/svn.html deleted file mode 100644 index 4a69f9b6da..0000000000 --- a/doc/developers/svn.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - deal.II SVN Archive - - - - - - - - -

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: -

trunk: - This is the location of the current development version; it contains the - directories deal.II - with the library proper - and tests - with the testsuite. - -
tags: - contains released versions. They have the same - structure as the trunk. - -
branches: - currently active branches; it also has subdirectories: -
- releases: - branches for releases of deal.II -
- retired: - development branches that have been merged into the - trunk and are no longer used. -
-

- -

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: - -

Create the branch using -

-$ svn copy https://svn.dealii.org/trunk/ https://svn.dealii.org/branches/new-branch-name
-

- -

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 - -
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$ -

- -

- -

- - - diff --git a/doc/developers/toc.html b/doc/developers/toc.html index 1c977b9296..7960bba38a 100644 --- a/doc/developers/toc.html +++ b/doc/developers/toc.html @@ -24,8 +24,6 @@ have the following resources available:

Documentation

Documentation of the SVN Archive and - information on recent changes to the library.
Build system internals: