Opened 6 years ago
Closed 6 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: |
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 6 years ago by timgraham
- Owner set to timgraham
- Status changed from new to assigned
comment:2 Changed 6 years ago by timgraham
Merged branches/2017/dev_r8789_sbc/ into this branch (no conflicts):
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2017/dev_r8789_sbc
comment:3 Changed 6 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 6 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 .
comment:5 Changed 6 years ago by timgraham
comment:6 Changed 6 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 6 years ago by timgraham
comment:8 Changed 6 years ago by timgraham
XIOS read/write removed again because OFF_SRC doesn't compile.
comment:9 Changed 6 years ago by timgraham
Head of trunk merged in at r8989
comment:10 Changed 6 years ago by mathiot
- Resolution set to fixed
- Status changed from assigned to closed
Branch created from r8126 of trunk:
branches/2017/dev_METO_2017