]> https://gitweb.dealii.org/ - dealii.git/commitdiff
add documentation on svn archive
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 12 May 2009 11:46:33 +0000 (11:46 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 12 May 2009 11:46:33 +0000 (11:46 +0000)
git-svn-id: https://svn.dealii.org/trunk@18836 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/development/navbar.html
deal.II/doc/development/svn.html [new file with mode: 0644]
deal.II/doc/development/toc.html

index 7d92bfbccf09d1e6c83dd1dac65b92a6dbcdd9db..1c67a8f5f8eefe3ce94c335525415ce08c14ba91 100644 (file)
@@ -22,6 +22,7 @@
   <b><small>Writing code</small></b>
     
   <p>
+    <a href="svn.html">SVN Archive</a>
     <a href="makefiles.html" target="body">Makefiles</a><br />
     <a href="writing-documentation.html"
        target="body">Documentation</a><br />
diff --git a/deal.II/doc/development/svn.html b/deal.II/doc/development/svn.html
new file mode 100644 (file)
index 0000000..96ff151
--- /dev/null
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+                 "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <link href="../screen.css" rel="StyleSheet">
+  <title>deal.II SVN Archive</title>
+  <meta name="author" content="the deal.II authors <authors@dealii.org>">
+  <meta name="copyright" content="Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors">
+  <meta name="date" content="$Date: 2006-07-24 10:37:21 -0500 (Mon, 24 Jul 2006) $">
+  <meta name="svn_id" content="$Id: writing-documentation.html 13428 2006-07-24 15:37:21Z bangerth $">
+  <meta name="keywords" content="deal dealii finite elements fem triangulation">
+  <meta http-equiv="content-language" content="en">
+</head>
+<body>
+
+  <h1>Documentation of the deal.II SVN Archive</h1>
+  
+  <h2>The global structure</h2>
+
+
+  The root of the deal.II archive is located
+  at <a href="http://www.dealii.org/svn/dealii/">http://www.dealii.org/svn/dealii/</a>.
+  There, we can find three subdirectories:
+  <ul>
+    <li> The current version is found
+    in <a href="http://www.dealii.org/svn/dealii/trunk/">trunk</a>,
+    which contains the
+    directories <a href="http://www.dealii.org/svn/dealii/trunk/deal.II">deal.II</a>
+    with the library
+    and <a href="http://www.dealii.org/svn/dealii/trunk/tests">tests</a>
+    with the test suite.
+
+    <li> The
+    subdirectory <a href="http://www.dealii.org/svn/dealii/tags/">tags</a>
+    contains the released versions. They have the same
+    structure as the trunk.
+      
+    <li> The
+    subdirectory <a href="http://www.dealii.org/svn/dealii/branches/">branches</a>
+    has cureently active branches with developments, that are not yet
+    scheduled to be incorporated into the library. Additionally, it has subdirectories
+      <ul>
+       <li> <a href="http://www.dealii.org/svn/dealii/branches/releases">releases</a>
+       with the branches on which the releases are,
+         <li> <a href="http://www.dealii.org/svn/dealii/branches/retired">retired</a>
+         with development branches which have been merged into the
+         trunk and are therefore not used anymore.
+           </ul>
+      </ul>
+
+  <h2>Creating a development branch</h2>
+  
+  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 <tt>svnmerge</tt> can be used. Such a branch is created in
+  the following steps:
+  
+  <ol>
+    <li> Create the branch using
+      <pre>
+       svn copy http://www.dealii.org/svn/dealii/trunk/ http://www.dealii.org/svn/dealii/branches/new-branch-name
+      </pre>
+    <li> Either check out the new branch or switch your working copy by
+      <pre>
+       svn switch http://www.dealii.org/svn/dealii/branches/new-branch-name
+      </pre>
+      This command assumes you are in the top level directory, the one
+      containing <tt>deal.II</tt> and <tt>tests</tt>
+    <li> Initialize the merge tracking svnmerge: in the top level directory, call
+      <pre>
+       svnmerge.py init
+       svn ci -F svnmerge-commit-message.txt
+       rm svnmerge-commit-message.txt
+      </pre>
+      This should be done before making any local changes!
+  </ol>
+</body>
+</html>
+
index 8fdfbe9468fbbd28d8ef459cc7da8bc865312bac..e46b7d38f93291c65b3e5f57ff21fc533c3d7a37 100644 (file)
@@ -31,6 +31,9 @@
     </p>
 
     <ul> 
+    <li> <p> Documentation of the <a href="svn.html">SVN Archive</a>.</p>
+
+
     <li> <p><a href="makefiles.html" target="body">Makefiles</a>:
          The library has a file which exports several make variables
         to Makefiles which include it. This information may be used

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.