...
| 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 | Starting from ACME master, commit f255704 by Az on March 28. Notes: 628a26d is first commit in ACME after last split 215e459 is commit in ESMCI last brought to ACME, which is the 5.2.0 tag 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 | On ESMCI: agsalin/merge-from-acme-03292017 Commits merged with master | Send ACME's CIME5.2 changes to ESMCI (Acme changes as of 03292017 since last split) |
| merge ESMCI back to ACME | Starting in ACME master: git checkout -b agsalin/update-to-cime5.3 git fetch esmcicime git subtree pull --prefix=cime esmcicime master | On ACME: agsalin/update-to-cime5.3 | 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. |
5/2/2107: merge more ESMCI changes to ACME, without doing ACME→ESMCI first. | same as above | On ACME: agsalin/update-to-cime5.3.1 | CIME master hash: ae2a5ca15297cd tag: TBD |
Add of CIME5 to ACME:
...