Changes between Version 8 and Version 9 of ticket/0877_LOCEAN_2011
- Timestamp:
- 2011-10-28T12:02:08+02:00 (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
ticket/0877_LOCEAN_2011
v8 v9 21 21 '''Main tasks'''[[BR]] 22 22 23 '''(1) ''' Copy of the trunk at the lowest base revision number for the branches to be merged ( rev 2787 ) [[BR]]23 '''(1) Copy of the trunk at the lowest base revision number for the branches to be merged ( rev 2787 )''' [[BR]] 24 24 {{{ 25 25 svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk -r 2787 \ … … 28 28 }}} 29 29 30 '''(2) ''' Check out the new branch and merge in the first development branch[[BR]]30 '''(2) Check out the new branch and merge in the first development branch '''[[BR]] 31 31 {{{ 32 32 svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011 dev_LOCEAN_2011 … … 47 47 No conflicts 48 48 49 '''(3) ''' Merge in the second development branch in the new branch[[BR]]49 '''(3) Merge in the second development branch in the new branch ''' [[BR]] 50 50 {{{ 51 51 svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ … … 83 83 No conflicts 84 84 85 '''(4) ''' Merge in the third development branch in the new branch[[BR]]85 '''(4) Merge in the third development branch in the new branch ''' [[BR]] 86 86 {{{ 87 87 svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ … … 366 366 }}} 367 367 368 '''(5) ''' Merge in the trunk changes between 2787 and 2855[[BR]]368 '''(5) Merge in the trunk changes between 2787 and 2855 ''' [[BR]] 369 369 {{{ 370 370 … … 392 392 393 393 394 '''(6) ''' Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020[[BR]]394 '''(6) Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020 ''' [[BR]] 395 395 {{{ 396 396