Version 3 (modified by cbricaud, 8 years ago) (diff)

Stage 1 of 2012 merge party. Merge NOC and Mercator developments

Step 1. Copy NOC 2012 development branch

svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_2012_rev3555 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_MERCATOR_2012 \
         -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"

Step 2. Merge Mercator's branch into dev_NOC_MERCATOR_2012 branch

svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_MERCATOR_2012  dev_NOC_MERCATOR_2012
cd dev_NOC_MERCATOR_2012
svn  merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555 .