...
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 | Starting |
from |
ACME |
master, |
commit |
f255704 |
by |
Az |
on |
March |
28. |
subtree |
split |
628a26d^.. |
--prefix=cime |
\ |
--ignore-joins |
-b |
agsalin/split-03292017 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) |
Add of CIME5 to ACME:
The existing cime was removed with git rm and the above repeated with
...