Changes between Version 3 and Version 4 of ticket/0684


Ignore:
Timestamp:
2010-06-25T16:32:40+02:00 (10 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v3 v4  
    2020    * DEV_1879_mpp_rep [[BR]] 
    2121 
    22 Step 1 is to create the branch from the earliest trunk revision from which any of the branches to be merged were created. In this case revision 1784. The command used was: 
     22=== Step 1 === is to create the branch from the earliest trunk revision from which any of the branches to be merged were created. In this case revision 1784. The command used was: 
    2323 
    2424{{{ 
     
    2929}}} 
    3030 
    31 Step 2 is to checkout the new branch, merge in the differences between the head of the 3DF branch and the trunk@1784 and check back in the modified branch. This will simply recreate the 3DF branch but the associated changes will be easily identified: 
     31=== Step 2 === is to checkout the new branch, merge in the differences between the head of the 3DF branch and the trunk@1784 and check back in the modified branch. This will simply recreate the 3DF branch but the associated changes will be easily identified: 
    3232 
    3333 
     
    5959}}} 
    6060 
    61 Step 3 is to merge in the changes on the trunk between revision 1784 and 1821 (which is the next lowest base version used for the branches).  
     61=== Step 3 === is to merge in the changes on the trunk between revision 1784 and 1821 (which is the next lowest base version used for the branches).  
    6262 
    6363 
     
    182182}}} 
    183183 
     184=== Step 4 === is to merge in the changes between the head of the dev_r1821_mixed_ldfdyn branch and the trunk@1821: 
     185 
     186 
     187{{{ 
     188svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1821 \ 
     189          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_r1821_mixed_ldfdyn  
     190 
     191< password > 
     192 
     193 
     194--- Merging r1822 through r1963 into 'DEV_r1784_mid_year_merge_2010': 
     195U    DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist 
     196U    DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Chapters/Chap_LDF.tex 
     197U    DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Namelist/nam_dynldf 
     198U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf_lap.F90 
     199U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf.F90 
     200U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 
     201U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90 
     202U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90 
     203U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 
     204U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90 
     205U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn.F90 
     206}}} 
     207 
     208Still no conflicts, so check this in and move onto step 5 
     209 
     210{{{ 
     211svn ci -m"ticket #684 step 4: Add in changes between the head of the dev_r1821_mixed_ldfdyn branch and the trunk@1821" 
     212}}} 
     213 
    184214 
    185215=== Testing ===