Opened 9 years ago

Closed 9 years ago

Last modified 4 years ago

#1017 closed Task (fixed)

Branch for merging 2012 CMCC and INGV developments

Reported by: vichi Owned by: vichi
Priority: low Milestone:
Component: OCE Version: release-3.4
Severity: Keywords:
Cc: Branch review:
MP ready?: Task progress:

Description

Created a branch to merge CMCC and INGV

Commit History (1)

ChangesetAuthorTimeChangeLog
3645vichi2012-11-24T14:11:55+01:00

Step 1: Created dev_CMCC_2012 merge branch, see ticket #1017

Change History (3)

comment:1 Changed 9 years ago by vichi

  • Owner changed from NEMO team to vichi
  • Status changed from new to assigned

Step 1: create the new branch

svn copy svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk -r 3555\  svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_CMCC_INGV_2012 \
> -m "Step 1: Created dev_CMCC_2012 merge branch, see ticket #1017"

Step 2: insert the CMCC branch (easy!)

svn co svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_CMCC_INGV_2012
svn merge -r3555:HEAD svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_CMCC_2012 dev_CMCC_INGV_2012

Step 3: insert the INGV branch

svn merge -r3555:HEAD svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_INGV dev_CMCC_INGV_2012

This creates some useless conflicts not related to the new parts

A  +    NEMOGCM/ARCH/CMCC
      C NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm
      >   local add, incoming add upon merge
 M      NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
 M      NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
 M      NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
D       NEMOGCM/ARCH/arch-PW6_CALYPSO.fcm
M       NEMOGCM/CONFIG/AMM12/EXP00/namelist
M       NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
M       NEMOGCM/CONFIG/GYRE/EXP00/namelist
A  +    NEMOGCM/CONFIG/GYRE_BFM
A  +    NEMOGCM/CONFIG/ORCA025_LIM
M       NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
M       NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
A  +    NEMOGCM/CONFIG/PELAGOS
A  +    NEMOGCM/CONFIG/PELAGOS025
A  +    NEMOGCM/CONFIG/PELAGOS_OFF
MM      NEMOGCM/CONFIG/cfg.txt
M       NEMOGCM/EXTERNAL/IOIPSL/tools/flio_rbld.f90
M       NEMOGCM/NEMO/OFF_SRC/domrea.F90
M       NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
M       NEMOGCM/NEMO/OFF_SRC/nemogcm.F90
M       NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90
M       NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90
M       NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90
M       NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
M       NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90
M       NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
M       NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
M       NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
M       NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90
M       NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90
M       NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90
M       NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
M       NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
M       NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
M       NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
M       NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
M       NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
M       NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90
M       NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90
M       NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
M       NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90
M       NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
M       NEMOGCM/NEMO/TOP_SRC/trc.F90
M       NEMOGCM/NEMO/TOP_SRC/trcnam.F90
M       NEMOGCM/NEMO/TOP_SRC/trcsub.F90
      C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS
      >   local edit, incoming replace upon merge
      C NEMOGCM/SETTE/README
      >   local edit, incoming replace upon merge
      C NEMOGCM/SETTE/fcm_job.sh
      >   local edit, incoming replace upon merge
R  +    NEMOGCM/SETTE/input_AMM12.cfg
R  +    NEMOGCM/SETTE/input_AMM12_PISCES.cfg
      C NEMOGCM/SETTE/input_ORCA2_LIM.cfg
      >   local edit, incoming replace upon merge
R  +    NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg
!     C NEMOGCM/SETTE/input_POMME.cfg
      >   local delete, incoming delete upon merge
      C NEMOGCM/SETTE/prepare_job.sh
      >   local edit, incoming replace upon merge
M     C NEMOGCM/SETTE/sette.sh
      >   local edit, incoming replace upon merge
!     C NEMOGCM/SETTE/sette.sh.vargas
      >   local delete, incoming delete upon merge
Summary of conflicts:
  Tree conflicts: 9

I think there's no need to bother about that at this point and decide to go on by resolving with:

svn resolve --accept working NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm \
NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS \
NEMOGCM/SETTE/README \
NEMOGCM/SETTE/input_ORCA2_LIM.cfg \
NEMOGCM/SETTE/input_POMME.cfg \
NEMOGCM/SETTE/prepare_job.sh \
NEMOGCM/SETTE/sette.sh \
NEMOGCM/SETTE/sette.sh.vargas \
NEMOGCM/SETTE/fcm_job.sh

We can always resolve later by taking the files from another branch.

Final step: commit

svn ci -m "Add the resulting merged branch from CMCC and INGV 2012 developments"

comment:2 Changed 9 years ago by vichi

  • Resolution set to fixed
  • Status changed from assigned to closed

comment:3 Changed 4 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.