Changes between Version 2 and Version 3 of ticket/1020_dev_NOC_MERCATOR_2012


Ignore:
Timestamp:
2012-11-26T12:07:38+01:00 (9 years ago)
Author:
cbricaud
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1020_dev_NOC_MERCATOR_2012

    v2 v3  
    1111         -m"Create branch for the merge of all NOC and MERCATOR 2012 developments. See ticket #1020. Step 1: copy NOC branch to 2012/dev_NOC_MERCATOR_2012" 
    1212}}} 
     13 
     14 
     15'''Step 2'''. Merge Mercator's branch into dev_NOC_MERCATOR_2012 branch 
     16 
     17 
     18{{{ 
     19svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_MERCATOR_2012  dev_NOC_MERCATOR_2012 
     20cd dev_NOC_MERCATOR_2012 
     21svn  merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555 . 
     22}}} 
     23