Opened 3 years ago

Closed 3 years ago

#1990 closed Task (fixed)

Merge of Met Office 2017 branches

Reported by: timgraham Owned by: timgraham
Priority: normal Milestone: 2017 WP
Component: OCE Version: trunk
Severity: minor Keywords:
Cc: Review: failed
MP ready?: no
Progress: Unspecified

Description

Context

Documenting steps for merge of Met Office branches ready for merge party

Implementation plan


Commit History (0)

(No commits)

Change History (10)

comment:1 Changed 3 years ago by timgraham

  • Owner set to timgraham
  • Status changed from new to assigned

Branch created from r8126 of trunk:
branches/2017/dev_METO_2017

comment:3 Changed 3 years ago by timgraham

  • Severity set to blocker

Merged branches/UKMO/r8727_WAVE-2_Clementi_add_coupling.
Note the 2 URL merge used to avoid removing svn keywords from the merge branch
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/r8727_WAVE-2_Clementi_add_coupling@8749 svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/r8727_WAVE-2_Clementi_add_coupling@8765 .

comment:4 Changed 3 years ago by timgraham

Merged branches/2017/dev_r8600_xios_read_write_v2 (r8910)
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2017/dev_r8600_xios_read_write_v2 .

Last edited 3 years ago by timgraham (previous) (diff)

comment:5 Changed 3 years ago by timgraham

r8924: The last change has been reverted because it won't compile with the version of XIOS2.0 (r952) usually used for SETTE testing on the Met Office machine.

comment:6 Changed 3 years ago by timgraham

Merged wetting and drying branch in:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@8814 svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/ROMS_WAD_7832 .

comment:7 Changed 3 years ago by timgraham

Merged in XIOS read/write branch again at r8987. This requires XIOS2 r965 or later
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2017/dev_r8600_xios_read_write_v2 .

comment:8 Changed 3 years ago by timgraham

XIOS read/write removed again because OFF_SRC doesn't compile.

comment:9 Changed 3 years ago by timgraham

Head of trunk merged in at r8989

comment:10 Changed 3 years ago by mathiot

  • Resolution set to fixed
  • Status changed from assigned to closed
Note: See TracTickets for help on using tickets.