Changes between Version 51 and Version 52 of 2010WP/2010fromMergePartyToVersion3.3

Timestamp:

2010-12-10T12:11:14+01:00 (14 years ago)

Author:

clevy

Comment:

--

2010WP/2010fromMergePartyToVersion3.3

@@ -73 +73 @@
 Starting from the trunk, after the 3_2_2 tag:
 
-
 {{{
 svn mkdir -m "Create NEMOGCM directory" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMOGCM
 }}}
-
 {{{
 svn move -m "Move  NEMO directory in NEMOGCM" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMO svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMOGCM
 }}}
-
 {{{
 svn move -m "Move  EXTERNAL directory in NEMOGCM" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/EXTRERNAL svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMOGCM
 }}}
-
 {{{
 svn move -m "Move  CONFIG directory in NEMOGCM" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/CONFIG svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMOGCM
 }}}
-
 {{{
 svn move -m "Move  AGRIF directory in NEMOGCM/EXTERNAL" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/AGRIF svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMOGCM/EXTERNAL
 }}}
- Comments: this leaves NVTK and UTIL at the trunk level, is this what we want?)
+Comments: this leaves NVTK and UTIL at the trunk level, is this what we want?)
 
+1 - Add the new release 3_3 in the trunk:
+
+This has to be a direct copy: we do not want to do any merge at this stage:
+
+Copy what we need of the 3_3_beta branch into the trunk:
+
+{{{
+svn copy -m "Copy nemo_v3_3_beta/NEMOGCM into the trunk" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/nemo_v3_3_beta/NEMOGCM svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/
+svn copy -m "Copy nemo_v3_3_beta/DOC into the trunk" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/nemo_v3_3_beta/DOC svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/
+svn copy -m "Copy nemo_v3_3_beta/ADM into the trunk" svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/nemo_v3_3_beta/ADM svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/
+
+
+}}}
 === Tag and release of nemo_v3_3 ===
 === Delete the development branches for 2010 (if they went back to the new version of course) ===