Opened 8 years ago

Closed 8 years ago

Last modified 3 years ago

#1003 closed Task (fixed)

UKMO merge branch

Reported by: rfurner Owned by: rfurner
Priority: normal Milestone:
Component: OCE Version: release-3.4
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description

A branch needs to be created to hold the Met Office 2012 code updates, ahead of the merge party in Paris.

Commit History (0)

(No commits)

Change History (5)

comment:1 Changed 8 years ago by rfurner

branch created from trunk at revision 3435;

svn copy -r 3435 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk

and checked out;

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

Changes from dev_r3435_UKMO7_SCOORDS merged in, and commit back;

svn merge -r !3435:3507 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3435_UKMO7_SCOORDS

svn ci -m "Changes from branch dev_r3435_UKMO7_SCOORDS revision 3435 to 3507 merged in"

Changes from trunk between 3435 and 3452 merged in, and committed back;

svn merge -r !3435:3452 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/

svn ci -m "Changes from trunk, revision 3435 to 3452 merged in"

Changes from dev_r3452_UKMO_DIADCT between 3452 and 3530 merged in and committed back;

svn merge -r !3452:3530 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3452_UKMO2_DIADCT

svn ci -m "Changes from dev_r3452_UKMO2_DIADCT, revision 3452 to 3530 merged in"

Changes from trunk between 3452 and 3555 merged in and committed back;

svn merge -r !3452:3555 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk 

svn ci -m "Changes from trunk, revision 3452 to 3555 merged in"

comment:2 Changed 8 years ago by rfurner

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

comment:3 Changed 4 years ago by nicolasmartin

  • Keywords merge removed

comment:4 Changed 4 years ago by nicolasmartin

  • Keywords branch removed

comment:5 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.