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

Timestamp:

2012-11-26T12:07:38+01:00 (11 years ago)

Author:

cbricaud

Comment:

--

ticket/1020_dev_NOC_MERCATOR_2012

@@ -11 +11 @@
          -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 .
+}}}
+