From: bangerth Date: Sun, 6 Jan 2013 02:06:04 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e01ed7976fe37459f93d42b6163b04c17cf571f;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27944 0785d39b-7218-0410-832d-ea1e28bc413d --- 2e01ed7976fe37459f93d42b6163b04c17cf571f diff --cc deal.II/doc/development/svn.html index b1b623865e,22f1291bfa..307e0eb798 --- a/deal.II/doc/development/svn.html +++ b/deal.II/doc/development/svn.html @@@ -1,96 -1,87 +1,88 @@@ + "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: -
      + 	
    5. 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. -
    - + 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. +
+

+ - diff --cc deal.II/source/base/subscriptor.cc index 6d0bd775de,46c965b9c4..bb4638541a --- a/deal.II/source/base/subscriptor.cc +++ b/deal.II/source/base/subscriptor.cc @@@ -144,10 -144,10 +144,10 @@@ void Subscriptor::do_subscribe (const c #ifdef DEBUG if (object_info == 0) object_info = &typeid(*this); - Threads::ThreadMutex::ScopedLock lock (subscription_lock); + Threads::Mutex::ScopedLock lock (subscription_lock); ++counter; -#if DEAL_USE_MT == 0 +#ifndef DEAL_II_USE_MT const char *const name = (id != 0) ? id : unknown_subscriber; map_iterator it = counter_map.find(name); @@@ -171,10 -171,10 +171,10 @@@ void Subscriptor::do_unsubscribe (cons if (counter == 0) return; - Threads::ThreadMutex::ScopedLock lock (subscription_lock); + Threads::Mutex::ScopedLock lock (subscription_lock); --counter; -#if DEAL_USE_MT == 0 +#ifndef DEAL_II_USE_MT map_iterator it = counter_map.find(name); Assert (it != counter_map.end(), ExcNoSubscriber(object_info->name(), name)); Assert (it->second > 0, ExcNoSubscriber(object_info->name(), name));