Opened 5 years ago
Closed 5 years ago
#2341 closed Enhancement (fixed)
Start 2019 MERGE branch
| Reported by: | acc | Owned by: | systeam |
|---|---|---|---|
| Priority: | low | Milestone: | |
| Component: | env | Version: | trunk |
| Severity: | minor | Keywords: | |
| Cc: |
Description
Context
Start a 2019 UK Merge branch to try merging UK contributions. If successful this could form the basis of the 2019 merge.
Proposal
Branch to be named:
2019/dev_r11943_MERGE_2019
Start with a copy of the current trunk and merge in branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps to provide the base (effectively a separate copy of that branch). Then merge sequentially:
dev_r11613_ENHANCE-04_namelists_as_internalfiles/ fix_sn_cfctl_ticket2328/
in the first instance. Then test and review.
Other NOC and UKMO contributions to be merged when ready (subject to successful testing at relevant stages).
Commit History (3)
| Changeset | Author | Time | ChangeLog |
|---|---|---|---|
| 11960 | acc | 2019-11-25T18:19:39+01:00 | Branch 2019/dev_r11943_MERGE_2019. Merge in changes from 2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles. (svn merge -r 11614:11954). Resolved tree conflicts and one actual conflict. Sette tested(these changes alter the ext/AGRIF reference; remember to update). See ticket #2341 |
| 11949 | acc | 2019-11-22T15:29:17+01:00 | Merge in changes from 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. This just creates a fresh copy of this branch to use as the merge base. See ticket #2341 |
| 11947 | acc | 2019-11-22T13:23:31+01:00 | Create a 2019 merge branch named 2019/dev_r11943_MERGE_2019. See ticket #2341 |
Change History (4)
comment:1 Changed 5 years ago by acc
comment:2 Changed 5 years ago by acc
In 11949:
comment:3 Changed 5 years ago by acc
In 11960:
comment:4 Changed 5 years ago by clevy
- Resolution set to fixed
- Status changed from new to closed
In 11947: