Changes between Version 4 and Version 5 of ticket/1006_dev_NOC_2012_rev3555


Ignore:
Timestamp:
2012-11-22T16:38:32+01:00 (8 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1006_dev_NOC_2012_rev3555

    v4 v5  
    704704}}} 
    705705 
    706 This completes the NOCS merge.  
     706This completes the '''NOCS''' merge.  
     707 
     708'''Step 9'''. Merge in trunk changes between trunk@3385 and trunk@3452. Check-in changes if no conflicts arise 
     709 
     710{{{ 
     711svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3385 \ 
     712          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3452 \ 
     713          ./ 
     714 
     715--- Merging r3386 through r3452 into '.': 
     716U    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90 
     717U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces 
     718U    NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces 
     719A    NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm 
     720U    NEMOGCM/NEMO/OFF_SRC/domain.F90 
     721U    NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 
     722U    NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 
     723Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90'. 
     724Select: (p) postpone, (df) diff-full, (e) edit, 
     725        (mc) mine-conflict, (tc) theirs-conflict, 
     726        (s) show all options: p 
     727C    NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 
     728U    NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 
     729U    NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 
     730U    NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 
     731U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 
     732U    NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 
     733Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90'. 
     734Select: (p) postpone, (df) diff-full, (e) edit, 
     735        (mc) mine-conflict, (tc) theirs-conflict, 
     736        (s) show all options: p 
     737C    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 
     738U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 
     739U    NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 
     740U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 
     741U    NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 
     742U    NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 
     743U    NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 
     744U    NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 
     745U    NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 
     746U    NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 
     747U    NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 
     748Summary of conflicts: 
     749  Text conflicts: 2 
     750 
     751}}} 
     752 
     753Resolved conflicts. 1 minor one in sbcmod.F90. 1 slightly trickier one in closea.F90. 
     754 
     755{{{ 
     756 
     757svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 9: Merge in trunk changes between revision 3385 and 3452" 
     758  
     759Sending        . 
     760Adding         NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm 
     761Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm 
     762Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm 
     763Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm 
     764Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces 
     765Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces 
     766Sending        NEMOGCM/CONFIG/cfg.txt 
     767Sending        NEMOGCM/NEMO/OFF_SRC/domain.F90 
     768Sending        NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 
     769Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 
     770Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 
     771Sending        NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 
     772Sending        NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 
     773Sending        NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 
     774Sending        NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 
     775Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 
     776Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 
     777Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 
     778Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 
     779Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 
     780Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 
     781Sending        NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 
     782Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 
     783Sending        NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 
     784Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 
     785Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 
     786Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 
     787Sending        NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90 
     788Transmitting file data ....................... 
     789Committed revision 3632. 
     790}}}