From e4a37a2d738c6031df93390cd48c6004fde809bc Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Tue, 12 May 2009 11:46:33 +0000 Subject: [PATCH] add documentation on svn archive git-svn-id: https://svn.dealii.org/trunk@18836 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/development/navbar.html | 1 + deal.II/doc/development/svn.html | 80 +++++++++++++++++++++++++++++ deal.II/doc/development/toc.html | 3 ++ 3 files changed, 84 insertions(+) create mode 100644 deal.II/doc/development/svn.html diff --git a/deal.II/doc/development/navbar.html b/deal.II/doc/development/navbar.html index 7d92bfbccf..1c67a8f5f8 100644 --- a/deal.II/doc/development/navbar.html +++ b/deal.II/doc/development/navbar.html @@ -22,6 +22,7 @@ Writing code

+ SVN Archive Makefiles
Documentation
diff --git a/deal.II/doc/development/svn.html b/deal.II/doc/development/svn.html new file mode 100644 index 0000000000..96ff1514c5 --- /dev/null +++ b/deal.II/doc/development/svn.html @@ -0,0 +1,80 @@ + + + + + deal.II SVN Archive + + + + + + + + + +

Documentation of the deal.II SVN Archive

+ +

The global structure

+ + + The root of the deal.II archive is located + at http://www.dealii.org/svn/dealii/. + There, we can find 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: + +
    +
  1. Create the branch using +
    +	svn copy http://www.dealii.org/svn/dealii/trunk/ http://www.dealii.org/svn/dealii/branches/new-branch-name
    +      
    +
  2. Either check out the new branch or switch your working copy by +
    +	svn switch http://www.dealii.org/svn/dealii/branches/new-branch-name
    +      
    + This command assumes you are in the top level directory, the one + containing deal.II and tests +
  3. Initialize the merge tracking svnmerge: in the top level directory, call +
    +	svnmerge.py init
    +	svn ci -F svnmerge-commit-message.txt
    +	rm svnmerge-commit-message.txt
    +      
    + This should be done before making any local changes! +
+ + + diff --git a/deal.II/doc/development/toc.html b/deal.II/doc/development/toc.html index 8fdfbe9468..e46b7d38f9 100644 --- a/deal.II/doc/development/toc.html +++ b/deal.II/doc/development/toc.html @@ -31,6 +31,9 @@