source: NEMO/trunk/cfgs/ref_cfgs.txt @ 12377

Last change on this file since 12377 was 12377, checked in by acc, 7 months ago

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge —ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The —ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

  • Property svn:keywords set to Id
File size: 397 bytes
Line 
1AGRIF_DEMO OCE ICE NST
2AMM12 OCE
3C1D_PAPA OCE
4GYRE_BFM OCE TOP
5GYRE_PISCES OCE TOP
6ORCA2_OFF_PISCES OCE TOP OFF
7ORCA2_OFF_TRC OCE TOP OFF
8ORCA2_SAS_ICE OCE ICE NST SAS
9ORCA2_ICE_PISCES OCE TOP ICE NST
10ORCA2_ICE_ABL OCE ICE ABL
11ORCA2_SAS_ICE_ABL OCE SAS ICE ABL
12ORCA2_ICE OCE ICE
13SPITZ12 OCE ICE
14WED025 OCE ICE
15eORCA025_ICE OCE ICE
16eORCA025_ICE_ABL OCE ICE ABL
17eORCA025_SAS_ICE_ABL OCE SAS ICE ABL
Note: See TracBrowser for help on using the repository browser.