Opened 7 years ago

Closed 6 years ago

Last modified 3 years ago

#1185 closed Task (fixed)

Branch for all 2013 developments

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

Description (last modified by cetlod)

  • merge of the last 2 branches 2013 :
  • dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013
  • dev_r3858_NOC_ZTC

1st step : Copy dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013 in dev_MERGE_2013

svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_MERGE_2013
         -m "Step 1: Created dev_MERGE_2013 branch"

2nd step : checkout the new branch and merge in the branch dev_r3858_NOC_ZTC with trunk rev 4119

svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4119 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3858_NOC_ZTC dev_MERGE_2013

Commit History (2)

ChangesetAuthorTimeChangeLog
4292cetlod2013-11-20T17:28:04+01:00

dev_MERGE_2013 : 1st step of the merge, see ticket #1185

4291cetlod2013-11-20T16:41:35+01:00

Step 1: Created dev_MERGE_2013 branch, see ticket #1185

Change History (3)

comment:1 Changed 7 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.