New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
ticket/0877_LOCEAN_2011 (diff) – NEMO

Changes between Version 8 and Version 9 of ticket/0877_LOCEAN_2011


Ignore:
Timestamp:
2011-10-28T12:02:08+02:00 (12 years ago)
Author:
cetlod
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0877_LOCEAN_2011

    v8 v9  
    2121'''Main tasks'''[[BR]] 
    2222 
    23 '''(1)''' Copy of the trunk at the lowest base revision number for the branches to be merged ( rev 2787 ) [[BR]] 
     23'''(1) Copy of the trunk at the lowest base revision number for the branches to be merged ( rev 2787 )''' [[BR]]  
    2424{{{ 
    2525svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk -r 2787 \  
     
    2828}}} 
    2929 
    30 '''(2)''' Check out the new branch and merge in the first development branch [[BR]] 
     30'''(2) Check out the new branch and merge in the first development branch '''[[BR]] 
    3131{{{ 
    3232svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011  dev_LOCEAN_2011 
     
    4747No conflicts 
    4848 
    49 '''(3)''' Merge in the second development branch in the new branch [[BR]] 
     49'''(3) Merge in the second development branch in the new branch ''' [[BR]] 
    5050{{{ 
    5151svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     
    8383No conflicts 
    8484 
    85 '''(4)''' Merge in the third development branch in the new branch [[BR]] 
     85'''(4) Merge in the third development branch in the new branch ''' [[BR]] 
    8686{{{ 
    8787svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     
    366366}}} 
    367367 
    368 '''(5)''' Merge in the trunk changes between 2787 and 2855 [[BR]] 
     368'''(5) Merge in the trunk changes between 2787 and 2855 ''' [[BR]] 
    369369{{{ 
    370370 
     
    392392 
    393393 
    394 '''(6)''' Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020 [[BR]] 
     394'''(6) Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020 ''' [[BR]] 
    395395{{{ 
    396396