Changes between Version 5 and Version 6 of ticket/0877_LOCEAN_2011

Timestamp:

2011-10-22T16:06:20+02:00 (13 years ago)

Author:

cetlod

Comment:

--

ticket/0877_LOCEAN_2011

@@ -358 +358 @@
 Committed revision 2977.
 }}}
+
+'''(5)''' Merge in the trunk changes between 2787 and 2855 [[BR]]
+{{{
+
+cd dev_LOCEAN_2011
+
+svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
+          svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 ./
+
+U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+C    NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+}}}
+
+Resolve conflicts and commit the changes
+
+{{{
+svn ci -m "Add in changes from the trunk between revisions 2787 and 2855, see ticket #877"
+
+Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+Transmitting file data ...
+Committed revision 2978.
+}}}
 ----
 === Testing ===