Opened 7 years ago

Closed 7 years ago

Last modified 3 years ago

#1173 closed Task (fixed)

2013 Merge of CMCC developments

Reported by: vichi Owned by: vichi
Priority: low Milestone:
Component: OCE Version: release-3.5
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description

Merge of CMCC developments for 2013:

dev_r3996_CMCC6_topbc
dev_r3948_CMCC_NorthFold_Opt

on the merged branch dev_CMCC_2013

Commit History (8)

ChangesetAuthorTimeChangeLog
6969cetlod2016-10-03T09:29:42+02:00

v3.6stable : bugfix in PISCES when running offline, see ticket #1173

6968cetlod2016-10-03T08:39:14+02:00

trunk: minor bgufix on trcstp, see ticket #1173

6967cetlod2016-10-03T08:35:13+02:00

v3.6stable: minor bgufix on trcstp, see ticket #1173

4177vichi2013-11-11T12:15:42+01:00

ticket #1173 step 5: Add in changes from the trunk between revisions 3996 and 4119

4176vichi2013-11-11T12:13:04+01:00

ticket #1173 step 4: Add in changes from the 2013/dev_r3996_CMCC6_topbc

4175vichi2013-11-11T12:07:00+01:00

ticket #1173 step 3: Add in changes from the trunk between revisions 3948 and 3996

4174vichi2013-11-11T12:02:03+01:00

ticket #1173 step 2: Add in changes from the 2013/dev_r3948_CMCC_NorthFold_Opt

4173vichi2013-11-11T11:54:33+01:00

ticket #1173. Step 1: Created dev_CMCC_2013 merge branch

Change History (3)

comment:1 Changed 7 years ago by vichi

  • Owner changed from mvichi to vichi
  • Status changed from new to assigned

Step 1

svn copy svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3948 svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_CMCC_2013 -m "ticket #1173. Step 1: Created dev_CMCC_2013 merge branch"

Step 2

svn co svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_CMCC_2013
svn merge svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3948 svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3948_CMCC_NorthFold_Opt dev_CMCC_2013
cd dev_CMCC_2013
svn ci -m"ticket #1173 step 2: Add in changes from the 2013/dev_r3948_CMCC_NorthFold_Opt"

Step 3

svn merge svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3948 svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3996 ./
svn ci -m"ticket #1173 step 3: Add in changes from the trunk between revisions 3948 and 3996"

Step 4

svn merge svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3996 \
svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3996_CMCC6_topbc ./
svn ci -m"ticket #1173 step 4: Add in changes from the 2013/dev_r3996_CMCC6_topbc"

Step 5

svn merge svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3996 
svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4119 ./
svn ci -m"ticket #1173 step 5: Add in changes from the trunk between revisions 3996 and 4119"

No conflicts in any of the steps

comment:2 Changed 7 years ago by vichi

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

comment:3 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.