Changes between Version 5 and Version 6 of ticket/0889

Timestamp:

2011-11-14T14:01:02+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0889

@@ -26 +26 @@
 
 {{{
-svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \
-          svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_INGV_2011 \
+svn merge -r2855:3007    svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_INGV_2011 \
           dev_MERCATOR_INGV_2011_MERGE 
-
 }}}
 
 
-
 {{{
---- Merging differences between repository URLs into 'dev_MERCATOR_INGV_2011_MERGE':
+--- Merging r2803 through r3007 into 'dev_MERCATOR_INGV_2011_MERGE':
 U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib
 U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex
@@ -55 +52 @@
 U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
 U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
-Password: 
-Password: 
---- Merging r2803 through r3083 into 'dev_MERCATOR_INGV_2011_MERGE':
-   C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave
-   C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf
-   C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
-G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
-G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
-G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
-   C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90
-G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
-U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
-U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
-Summary of conflicts:
-  Tree conflicts: 4
 }}}
 
 
 
+
+
+