Why subtree for CIME?
Very early in ACME, we decided that we want developers to get a working version of the code with a single "git clone" command. For that reason, we use subtree to maintain CIME within ACME because CIME must be present for building/running the model. Submodule requires an additional command after the git clone.
...
Summary of merges and splits involving CIME5
| direction | commit on master and date merged. PR link. | feature branch |
|---|
| that was merged to master | how feature branch was created | notes | ||
|---|---|---|---|---|
| merge ESMCI to ACME | 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 | in ACME rljacob/cime/uptocime5.2.0 | brought in CIME5.2.0 215e459 is commit in ESMCI last brought to ACME, which is the 5.2.0 tag | ||
| split ACME to ESMCI | 2 on ESMCI: agsalin/cime52-with-acmesplit-03292017 acme commits merged to CIME 5.2 agsalin/merge-from-acme-03292017 Commits merged with ESMCI master | Starting from ACME master, commit f255704 by Az on March 28.
| Send ACME's CIME5.2 changes to ESMCI (Acme changes as of 2017-03-29 since last split) Notes: 628a26d is first commit in ACME after last |
215e459 is commit in ESMCI last brought to ACME, which is the 5.2.0 tag
On ESMCImerge Branch agsalin/split-03292017 not pushed (acme code sizeof cime repo?) |
On ESMCI:
agsalin/cime52-with-acmesplit-03292017
acme commits merged to CIME 5.2
| merge ESMCI back to ACME | On ACME: agsalin/ |
update- |
Commits merged with master
Send ACME's CIME5.2 changes to ESMCI
(Acme changes as of 03292017 since last split)
Starting in ACME master:
to-cime5.3 | git checkout -b agsalin/update-to-cime5.3 git fetch esmcicime git subtree pull --prefix=cime esmcicime master |
On ACME:
agsalin/update-to-cime5.3Brought in CIME 5.3.0-alpha06 CIME master hash: 6156e0a tag: cime5.3.0-alpha.06-toacme01 To facilitate merge, I first moved all ACME files to the new cime dir name, before subtree pull. |
Brought in entire CIME commit history. |
merge |
ESMCI |
to |
ACME | On ACME: agsalin/update-to-cime5.3.1 started 5/2/2107 | same as above | Brought in CIME 5.3.0-alpha.10 CIME master hash: 15297cd tag: |
cime5.3.0-alpha.10-toacme01 merge more ESMCI changes to ACME, without doing ACME→ESMCI first. |
Add of CIME5 to ACME:
The existing cime was removed with git rm and the above repeated with
...