#998 closed Task (fixed)
Created dev_INGV 2012 merge branch
| Reported by: | adani | Owned by: | nemo |
|---|---|---|---|
| Priority: | low | Milestone: | |
| Component: | OCE | Version: | v3.4 |
| Severity: | Keywords: | 2012 OPA v3.4 | |
| Cc: | oddo |
Description
This branch merges together changes from INGV4 and INGV7 development branches.
Commit History (5)
| Changeset | Author | Time | ChangeLog |
|---|---|---|---|
| 3577 | adani | 2012-11-16T12:47:14+01:00 | ticket #998. Step 5: Add in changes from the trunk between revisions 3521 and 3555. |
| 3576 | adani | 2012-11-16T12:39:11+01:00 | ticket #998. Step 4: Add in changes from the 2012/dev_r3521_INGV7_muscl branch |
| 3575 | adani | 2012-11-16T12:29:24+01:00 | ticket #998. Step 3: Add in changes from the trunk between revisions 3389 and 3521. |
| 3574 | adani | 2012-11-16T12:13:00+01:00 | ticket #998. Step 2: Add in changes from the 2012/dev_r3389_INGV4_stokes branch |
| 3573 | adani | 2012-11-16T11:54:18+01:00 | ticket #998. Step 1: Created dev_INGV 2012 merge branch |
Change History (12)
comment:1 Changed 11 years ago by adani
comment:2 Changed 8 years ago by clevy
- Resolution set to fixed
- Status changed from new to closed
comment:3 Changed 7 years ago by nicolasmartin
- Keywords 2012 New Stream features added
comment:4 Changed 7 years ago by nicolasmartin
- Keywords new added; New removed
comment:5 Changed 7 years ago by nicolasmartin
- Keywords nemo_v3_4* added
comment:6 Changed 7 years ago by nicolasmartin
- Keywords nemo_v3_4 added; Stream features new removed
comment:7 Changed 7 years ago by nicolasmartin
- Milestone 2012 Stream 3: New features deleted
Milestone 2012 Stream 3: New features deleted
comment:8 Changed 7 years ago by nicolasmartin
- Keywords nemo_v3_4 removed
comment:9 Changed 6 years ago by nemo
- Type changed from Development to Task
Remove 'Development' type
comment:10 Changed 6 years ago by nemo
- Keywords release-3.4* added; nemo_v3_4* removed
comment:11 Changed 6 years ago by nemo
- Keywords release-3.4* removed
comment:12 Changed 16 months ago by nemo
- Keywords OPA v3.4 added
Note: See
TracTickets for help on using
tickets.
svn copy svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3389 svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_INGV -m "ticket #998. Step 1: Created dev_INGV 2012 merge branch"
svn co svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_INGV
svn merge svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3389 svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3389_INGV4_stokes dev_INGV
cd dev_INGV
svn ci -m"ticket #998. Step 2: Add in changes from the 2012/dev_r3389_INGV4_stokes branch"
svn merge svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3389 svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3521 ./
svn ci -m "ticket #998. Step 3: Add in changes from the trunk between revisions 3389 and 3521."
svn merge svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3521 svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3521_INGV7_muscl ./
svn ci -m "ticket #998. Step 4: Add in changes from the 2012/dev_r3521_INGV7_muscl branch"
svn merge svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3521 svn+ssh://adani@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3555 ./
svn ci -m "ticket #998. Step 5: Add in changes from the trunk between revisions 3521 and 3555."