source: NEMO/branches/2020/dev_r12953_ENHANCE-10_acc_fix_traqsr/tests/demo_cfgs.txt @ 13121

Last change on this file since 13121 was 12377, checked in by acc, 10 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.

File size: 191 bytes
Line 
1CANAL OCE
2ISOMIP OCE
3ISOMIP+ OCE
4LOCK_EXCHANGE OCE
5OVERFLOW OCE
6ICE_AGRIF OCE NST SAS ICE
7ICE_ADV1D OCE SAS ICE
8ICE_ADV2D OCE SAS ICE
9VORTEX OCE NST
10WAD OCE
11BENCH OCE ICE TOP
12STATION_ASF OCE
Note: See TracBrowser for help on using the repository browser.