merge INGV and MERCATOR 2011 brnaches:


step1:
create the branch dev_MERCATOR_INGV_2011_MERGE by copying dev_MERCATOR_2011_MERGE in dev_MERCATOR_INGV_2011_MERGE


{{{
svn copy svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_2011_MERGE \
         svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_INGV_2011_MERGE \
-m "create branch for merge MERCATOR and INGV"
}}}



step2: domwload this branch:

{{{
svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_INGV_2011_MERGE dev_MERCATOR_INGV_2011_MERGE
}}}


step3: merge in dev_MERCATOR_INGV_2011_MERGE INGV branch (  dev_INGV_2011) 



{{{
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 \
          dev_MERCATOR_INGV_2011_MERGE 

}}}



{{{
--- Merging differences between repository URLs 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
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex
A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc
A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namzdf_ric
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90
U    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
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
}}}