Changes between Version 1 and Version 2 of ticket/0684


Ignore:
Timestamp:
2010-06-24T17:02:47+02:00 (10 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v1 v2  
    2727          -m "ticket #684 step 1: Create branch for mid year branch; start at the earliest base revision for the branches to be merged" 
    2828 
     29}}} 
     30 
     31Step 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: 
     32 
     33 
     34{{{ 
     35svn co svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_mid_year_merge_2010 
     36 
     37svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 \ 
     38          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_3DF DEV_r1784_mid_year_merge_2010 
     39 
     40<password> 
     41 
     42 
     43--- Merging r1785 through r1950 into 'DEV_r1784_mid_year_merge_2010': 
     44U    DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist 
     45U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcssr.F90 
     46U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/fldread.F90 
     47U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 
     48U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcice_if.F90 
     49U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90 
     50U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90 
     51U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcflx.F90 
     52U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtasal.F90 
     53U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtatem.F90 
     54U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/traqsr.F90 
     55 
     56cd DEV_r1784_mid_year_merge_2010 
     57<password> 
     58svn ci -m"ticket #684 step 2: Add in changes from the DEV_r1784_3DF branch" 
    2959}}} 
    3060