Changes between Version 3 and Version 4 of ticket/0874_NOC_2011_MERGE

Timestamp:

2011-10-26T18:30:40+02:00 (13 years ago)

Author:

acc

Comment:

--

ticket/0874_NOC_2011_MERGE

@@ -7 +7 @@
 
 {{{
-dev_r2782_NOCS_Griffies               [added to merge at changeset 2980]
-dev_r2787_NOCS_NEPTUNE            [added to merge at changeset 2986]
+dev_r2782_NOCS_Griffies            [added to merge at changeset 2980]
+dev_r2787_NOCS_NEPTUNE             [added to merge at changeset 2986]
 dev_r2802_NOCL_bfrimp
 dev_r2802_NOCL_prjhpg
@@ -35 +35 @@
 {{{
 svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
-                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2782_NOCS_Griffies \
-                 dev_NOC_2011_MERGE
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2782_NOCS_Griffies \
+          dev_NOC_2011_MERGE
 
 --- Merging r2783 through r2979 into 'dev_NOC_2011_MERGE':
@@ -83 +83 @@
 {{{
 svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
-                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
-                  ./
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
+          ./
  
 --- Merging r2783 through r2787 into '.':
@@ -111 +111 @@
 {{{
 svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
-                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_NOCS_NEPTUNE \
-                 ./
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_NOCS_NEPTUNE \
+          ./
 
 --- Merging r2791 through r2985 into '.':
@@ -148 +148 @@
 }}}
 
+'''Step 5'''. Merge in trunk changes between trunk@2787 and trunk@2802. Check-in changes if no conflicts arise
+
+
+{{{
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
+          ./
+ 
+--- Merging r2788 through r2802 into '.':
+U    NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+
+svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 5: Merge in trunk changes between revision 2787 and 2802" 
+
+Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+Transmitting file data .
+Committed revision 3001.
+}}}
+