Opened 8 years ago

Closed 6 years ago

Last modified 3 years ago

#1000 closed Task (fixed)

Branch for all LOCEAN 2012 developments

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

Description (last modified by cetlod)

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

  • dev_r3438_LOCEAN15_PISLOB
  • dev_r3387_LOCEAN6_AGRIF_LIM
  • dev_r3406_LOCEAN4_XIOS

Step 1 : Copy the trunk rev 3555 into LOCEAN branch

svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk -r 3555 \ 
         svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_LOCEAN_2012 \ 
         -m "Step 1: Created dev_LOCEAN_2012 merge branch, see ticket #1000"

Step 2 : Check out branch the dev_LOCEAN_2012 and merge in the first development branch dev_r3438_LOCEAN15_PISLOB, from its starting point ( r3438 ) on the trunk

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

svn merge -r3438:HEAD svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3438_LOCEAN15_PISLOB dev_LOCEAN_2012

Step 3 : merge in dev_LOCEAN2012 the second development branch dev_r3387_LOCEAN6_AGRIF_LIM , from its starting point ( r3387 ) on the trunk

svn merge -r3387:HEAD svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM dev_LOCEAN_2012

step 4 : Commit the changes

svn_ci "Add in branch  2012/dev_LOCEAN_2012 changes from dev_r3438_LOCEAN15_PISLOB & dev_r3387_LOCEAN6_AGRIF_LIM, see ticket 1000"

Commit History (1)

ChangesetAuthorTimeChangeLog
3579cetlod2012-11-16T15:06:32+01:00

Step 1: Created dev_LOCEAN_2012 merge branch, see ticket #1000

Change History (3)

comment:1 Changed 8 years ago by cetlod

  • Description modified (diff)

comment:2 Changed 6 years ago by gm

  • Resolution set to fixed
  • Status changed from new 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.