Opened 8 years ago

Closed 8 years ago

#1002 closed Bug (fixed)

Branch for all CMCC 2012 developments

Reported by: vichi Owned by: vichi
Priority: low Milestone:
Component: OCE Version: release-3.4
Severity: Keywords:
Cc:

Description

Create a branch for the merge of CMCC developments in 2012 :

dev_r3365_CMCC1_BDYOBCopt
dev_r3379_CMCC6_topbfm

Commit History (1)

ChangesetAuthorTimeChangeLog
3591vichi2012-11-19T11:51:37+01:00

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

Change History (2)

comment:1 Changed 8 years ago by vichi

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

Step 1 : Copy the trunk rev 3555 into LOCEAN 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_2012 \
-m "Step 1: Created dev_CMCC_2012 merge branch, see ticket #1002"

Step 2 : Check out branch the dev_CMCC_2012 and merge the first development branch dev_r3365_CMCC1_BDYOBCopt , from its starting point ( r3365 ) on the trunk

svn co svn+ssh://vichi@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_CMCC_2012 

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

Step 3 : merge the second development branch dev_r3379_CMCC6_topbfm from its starting point ( r3379 ) on the trunk

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

step 4 : Commit the changes

svn ci -m "Add in branch  2012/dev_CMCC_2012 changes from dev_r3365_CMCC1_BDYOBCopt & dev_r3379_CMCC6_topbfm, see ticket 1002"

comment:2 Changed 8 years ago by vichi

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