Changes between Version 5 and Version 6 of ticket/0883_MERCATOR_2011_MERGE

Timestamp:

2011-11-07T12:08:50+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0883_MERCATOR_2011_MERGE

@@ -77 +77 @@
 }}}
 
-step3
+
+'''step3: add changes from dev_r2787_MERCATOR3_tidalpot '''
+
+ 
+{{{
+svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
+           svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_MERCATOR3_tidalpot \
+            dev_MERCATOR_2011_MERGE
+}}}
+
+
+
+
+{{{
+--- Merging r2794 through r3046 into 'dev_MERCATOR_2011_MERGE':
+   C dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/nam_tide
+G    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+G    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90
+   C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90
+   C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90
+   C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90
+   C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90
+G    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90
+Summary of conflicts:
+  Tree conflicts: 5
+
+}}}
+
+Conflicts are solved.
+
+
+
+{{{
+svn ci -m "add changes from dev_r2787_MERCATOR3_tidalpot
+}}}