Changes between Version 1 and Version 2 of ticket/1417_merge_UKMO_NOC_2014

Timestamp:

2014-12-01T11:39:41+01:00 (10 years ago)

Author:

acc

Comment:

--

ticket/1417_merge_UKMO_NOC_2014

@@ -22 +22 @@
 
 {{{
-dev_r4879_UKMO_NOC_MERGE omfman$ svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4650 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM ./
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4650 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM ./
 
 svn status
@@ -148 +148 @@
 }}}
 
+'''Step 5.''' Merge in changes from the NOCS_ZTS branch
+
+{{{
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4743 \
+                svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4743_NOC2_ZTS ./
+
+--- Merging differences between repository URLs into '.':
+ G   DOC
+   C NEMOGCM/SETTE/input_ORCA2_LIM3.cfg
+   C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL
+   C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0
+Conflict discovered in '/Users/omfman/Desktop/MERGE2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/SETTE/sette.sh'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    NEMOGCM/SETTE/sette.sh
+U    NEMOGCM/CONFIG/makenemo
+A    NEMOGCM/CONFIG/uspcfg.txt
+U    NEMOGCM/CONFIG/SHARED/namelist_ref
+   C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_MLD_ortho.pro
+   C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.pstar4-testht
+ G   NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
+   C NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
+Conflict discovered in '/Users/omfman/Desktop/MERGE2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
+U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+U    NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
+U    NEMOGCM/NEMO/OPA_SRC/oce.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90
+U    NEMOGCM/NEMO/OPA_SRC/step.F90
+U    NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
+U    NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
+U    NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/par_ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limwri.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limcons.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limvar.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/iceini.F90
+A    NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh
+U    NEMOGCM/TOOLS/COMPILE/Fclean_var.sh
+U    NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh
+U    NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh
+U    NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh
+A    NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh
+U    NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh
+A    NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh
+U    NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh
+A    NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py
+ G   .
+--- Recording mergeinfo for merge between repository URLs into '.':
+
+ U   .
+ U   DOC
+ U   NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
+Summary of conflicts:
+  Text conflicts: 2
+  Tree conflicts: 6
+}}}
+
+'''Step 6.''' Resolve conflicts and check in
+
+{{{
+svn ci -m 'Branch dev_r4879_UKMO_NOC_MERGE, Check in merged changes from NOC_ZTS branch; all conflicts resolved'
+Password: 
+Sending        .
+Sending        DOC
+Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
+Sending        NEMOGCM/CONFIG/SHARED/namelist_ref
+Sending        NEMOGCM/CONFIG/makenemo
+Adding         NEMOGCM/CONFIG/uspcfg.txt
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
+Sending        NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh
+Sending        NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh
+Sending        NEMOGCM/TOOLS/COMPILE/Fclean_var.sh
+Sending        NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh
+Adding         NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh
+Sending        NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh
+Adding         NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh
+Sending        NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh
+Adding         NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh
+Adding         NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py
+Transmitting file data ......................
+Committed revision 4934.
+}}}
+
+