From 35a0622cef4b6015ba4575b8dc29e98c02287960 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 5 Jan 2013 23:10:50 +0000 Subject: [PATCH] Update. git-svn-id: https://svn.dealii.org/trunk@27936 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/development/svn.html | 150 +++++++++++++++---------------- 1 file changed, 71 insertions(+), 79 deletions(-) diff --git a/deal.II/doc/development/svn.html b/deal.II/doc/development/svn.html index 685b0d70f7..22f1291bfa 100644 --- a/deal.II/doc/development/svn.html +++ b/deal.II/doc/development/svn.html @@ -1,95 +1,87 @@ + "http://www.w3.org/TR/html4/loose.dtd"> - - - deal.II SVN Archive - - - - - - - - - + + + deal.II SVN Archive + + + + + + + + + -

Documentation of the deal.II SVN Archive

+

Documentation of the deal.II SVN Archive

-

The global structure

+

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

+

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

- -

Note: Maintaining a branch over a long time can become - quite cumbersome, since you have to merge changes on the trunk on a - regular basis so that the branch does not deviate too - much. Therefore, when adding functionality, like a new class or a - new function in a class or namespace, it is advisable not to create - a new branch, but to mark in the documentation clearly that this is - experimental. Before checking in, verify that the library compiles.

+

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

+ 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
    -      
    +
      +
    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. 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 -
    4. 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. -
    - +
  2. 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. +
+

+ - -- 2.39.5