Changes between Version 1 and Version 2 of ticket/0874_NOC_2011_MERGE

Timestamp:

2011-10-24T12:41:23+02:00 (13 years ago)

Author:

acc

Comment:

--

ticket/0874_NOC_2011_MERGE

@@ -7 +7 @@
 
 {{{
-dev_r2782_NOCS_Griffies
+dev_r2782_NOCS_Griffies               [added to merge at changeset 2980]
 dev_r2787_NOCS_NEPTUNE
 dev_r2802_NOCL_bfrimp
@@ -18 +18 @@
 
 
-Step 1. copy trunk at lowest revision number used by any of the branches to be merged
+'''Step 1.''' copy trunk at lowest revision number used by any of the branches to be merged
 
 
@@ -28 +28 @@
 
 Successfully created new branch:  '''branches/2011/dev_NOC_2011_MERGE'''
+
+'''Step 2'''. merge in changes from the first development branch into a checked out version of the merge branch. This simply recreates the first development branch but consolidates the
+changes made on that branch into a single changeset:
+
+
+{{{
+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
+
+--- Merging r2783 through r2979 into 'dev_NOC_2011_MERGE':
+U    dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namtra_ldf
+U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
+U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
+U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
+}}}
+
+'''NOTE: STILL SOME DOCUMENTATION CHANGES NEEDED FOR THIS BRANCH'''
+
+Check in merge branch:
+
+
+{{{
+cd dev_NOC_201_MERGE
+svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 2: Add changes from the 2011/dev_r2782_NOCS_Griffies branch"
+
+Sending        DOC/TexFiles/Namelist/namtra_ldf
+Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
+Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
+Transmitting file data ............
+Committed revision 2980.
+}}}