#1415 closed Task (fixed)
create CNRS 2014 development branch
| Reported by: | cetlod | Owned by: | nemo |
|---|---|---|---|
| Priority: | low | Milestone: | |
| Component: | OCE | Version: | trunk |
| Severity: | Keywords: | ||
| Cc: |
Description (last modified by cetlod)
- Branches to be merge
- 2014/dev_CNRS1_10_TEOS10_Ediag ( rev 4615 )
- 2014/dev_CNRS0_blk_core ( rev 4674 )
- 2014/dev_4728_CNRS04_coupled_interface
- trunk 4879
Merge Sequence :
1°) Copy the trunk at the lowest revision number 4615
svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4615 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_CNRS_2014
2°) check out & merge the 1st branch onto dev_CNRS_2014
svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_CNRS_2014
cd dev_CNRS_2014
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4615 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_CNRS1_10_TEOS10_Ediag ./
3°) Merge in the trunk changes between 4615 and 4674
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4615 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4674 ./
4°) merge the 2nd branch onto dev_CNRS_2014
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4674 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_CNRS0_blk_core ./
5°) Merge in the trunk changes between 4674 and 4728
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4674 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4728 ./
6°) merge the 3rd branch onto dev_CNRS_2014
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4728 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_4728_CNRS04_coupled_interface ./
7°) Merge in the trunk changes between 4728 and 4879
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4728 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4879 ./
Commit History (9)
| Changeset | Author | Time | ChangeLog |
|---|---|---|---|
| 4905 | cetlod | 2014-11-27T17:32:55+01:00 | 2014/dev_CNRS_2014 :minor correction on sbcice_lim.F90, see ticket #1415 |
| 4904 | cetlod | 2014-11-27T17:21:11+01:00 | 2014/dev_CNRS_2014 :minor correction, see ticket #1415 |
| 4903 | cetlod | 2014-11-27T17:17:41+01:00 | 2014/dev_CNRS_2014 :minor correction, see ticket #1415 |
| 4902 | cetlod | 2014-11-27T17:13:38+01:00 | 2014/dev_CNRS_2014 : Merge in the trunk changes between 4728 and 4879, see ticket #1415 |
| 4901 | cetlod | 2014-11-27T16:41:22+01:00 | 2014/dev_CNRS_2014 : merge the 3rd branch onto dev_CNRS_2014, see ticket #1415 |
| 4900 | cetlod | 2014-11-27T16:28:53+01:00 | 2014/dev_CNRS_2014 : Merge in the trunk changes between 4674 and 4728, see ticket #1415 |
| 4898 | cetlod | 2014-11-27T16:14:11+01:00 | 2014/dev_CNRS_2014 : merge the 2nd branch onto dev_CNRS_2014, see ticket #1415 |
| 4897 | cetlod | 2014-11-27T16:08:14+01:00 | 2014/dev_CNRS_2014 : Merge in the trunk changes between 4615 and 4674, see ticket #1415 |
| 4896 | cetlod | 2014-11-27T15:58:54+01:00 | 2014/dev_CNRS_2014 : merge the 1st branch onto dev_CNRS_2014, see ticket #1415 |
Change History (3)
comment:1 Changed 9 years ago by cetlod
- Description modified (diff)
comment:2 Changed 9 years ago by clevy
- Resolution set to fixed
- Status changed from new to closed
comment:3 Changed 7 years ago by nemo
- Type changed from Development to Task
Remove 'Development' type