We want to change the civicrm repo structure significantly, plus base our contrib branch on upstream. We probably want a fresh repo to do this in.
Change deployment scripts if necessary.
Ensure that the recursive submodules work correctly.
civi-4.6.9: The finished development master for civi 4.6.9 with WMF patches
- master + civi-upstream-4.6.9 + patches to customize civi + patches to fix WMF modules when running on 4.6.9
civi-4.6.9-deployment: Deployment version of civi-4.6.9, but done as a shortcut rather than a true merge to the "deployment" branch. Dead-end. Also, note that this branch will not be updated beyond the version used to do the schema migration.
- civi-4.6.9 + hacky deployment patch
master-plus-4.6.9: master + civi-4.6.9, this will become the new master.
deployment-prep-4.6.9: deployment + master-plus-4.6.9, this will become the new deployment