...
"the subtree" refers to all the code under https://github.com/ACME-Climate/ACME/cime
Initial add of
...
CIME2 to ACME:
This was done once.
ACME was freshly cloned (from Sept 3, 2015 head: https://github.com/ACME-Climate/ACME/commit/c2b9b202f95cba910b72a53acc4c747beac316a7 and a remote for the ACME cime CIME fork was added:
git remote add -f --tags acmecime git@github.com:ACME-Climate/cime.git
CimeCIME was added with this command:...
- move model components to their cime locations
- add cime build capability
- remove the models directory
- add ability to build component models with cime.
Summary of merges and splits
| direction | commit | feature branch | start of feature branch | notes |
|---|---|---|---|---|
| merge ESMCI to ACME | in ACME c50a810d9544251d50
| in ACME: /rljacob/cime/cime5-upgrade | in ACME: First removed cime2 in 8ed674f84ce Then did a subtree merge squash of 0eb331d in 7d7641505cc That squash was merge-committed to the branch in 15abd5853 | brought in CIME5.1.4 Did a bunch more commits on that branch to get everything working. |
| split ACME to ESMCI | send ACME's CIME5.1 changes to ESMCI | |||
| merge ESMCI to ACME | brought in CIME5.2.0 | |||
| split ACME to ESMCI | Send ACME's CIME5.2 changes to ESMCI |
Add of CIME5 to ACME:
The existing cime was removed with git rm and the above repeated with
...