New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
#1178 (Merged CMCC-INGV 2013 branches) – NEMO

Opened 10 years ago

Closed 10 years ago

Last modified 7 years ago

#1178 closed Task (fixed)

Merged CMCC-INGV 2013 branches

Reported by: delrosso Owned by: delrosso
Priority: low Milestone:
Component: OCE Version: v3.6
Severity: Keywords:
Cc: vichi

Description

Merge of CMCC-INGV branches 2013

Commit History (1)

ChangesetAuthorTimeChangeLog
4201poddo2013-11-14T15:09:37+01:00

ticket #1178 Merge of CMCC-INGV 2013 branches

Change History (3)

comment:1 Changed 10 years ago by delrosso

Step 1

svn copy svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4119 svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_CMCC_INGV_2013 -m "Created common branch CMCC-INGV for 2013 merge"


Step 2

svn merge svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4119 svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_CMCC_2013 dev_CMCC_INGV_2013

Step 3

svn merge svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_CMCC_INGV_2013 svn+ssh://poddo@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r4119_INGV6_sol ./

Conflicts resolved regarding namelist and namelist_top in NEMOGCM/CONFIG/GYRE_BFM/EXP00

Step 4

svn ci -m"ticket #1178 Merge of CMCC-INGV 2013 branches "

comment:2 Changed 10 years ago by vichi

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

comment:3 Changed 7 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.