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

Timestamp:

2011-10-28T10:57:58+02:00 (12 years ago)

Author:

cetlod

Comment:

--

ticket/0877_LOCEAN_2011

@@ -32 +32 @@
 svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011  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/branches/2011/dev_r2787_LOCEAN_offline_fldread 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/branches/2011/dev_r2787_LOCEAN_offline_fldread \
+          dev_LOCEAN_2011
 
 U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
@@ -47 +49 @@
 '''(3)''' Merge in the second development branch in the new branch [[BR]]
 {{{
-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/branches/2011/dev_r2787_PISCES_improvment  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/branches/2011/dev_r2787_PISCES_improvment \
+          dev_LOCEAN_2011
 
 U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
@@ -81 +85 @@
 '''(4)''' Merge in the third development branch in the new branch [[BR]]
 {{{
-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/branches/2011/dev_r2787_LOCEAN3_TRA_TRP   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/branches/2011/dev_r2787_LOCEAN3_TRA_TRP \
+          dev_LOCEAN_2011
 
 U    dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt
@@ -217 +223 @@
 Resolve conflicts and commit the changes
 {{{
-svn_ci "Add in branch 2011/dev_LOCEAN_2011 changes from 2011/dev_r2787_PISCES_improvment, 2011/dev_r2787_LOCEAN_offline_fldread and 2011/dev_r2787_LOCEAN3_TRA_TRP branches, see ticket #877"
+svn_ci "Add in branch 2011/dev_LOCEAN_2011 changes from 2011/dev_r2787_PISCES_improvment, \
+        2011/dev_r2787_LOCEAN_offline_fldread and 2011/dev_r2787_LOCEAN3_TRA_TRP branches, see ticket #877"
 
 Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist