OK, so here's the deal. We need to:
-
Re-run the tern migrations with the updated Babelsubs to perform the migrations with all the latest bugs fixed.
-
Provide partners with a stable staging server to test the DMR on.
-
Provide ourselves with a place to deploy changesets before they get to the stable staging server.
I think we should resurrect dev for a while and do the following:
-
Move the
staging
ref in the git repo to point at the revision right before we merged in the olddev
branch. This means it will be in the "pre-DMR, ready to run tern" state. -
From then on, no one commits to staging.
-
Resurrect dev, pointing the
dev
ref at the latest commit in our repo. Any and all commits should go onto dev. Dev will be deployed by Jenkins as it was before. -
Once Tern finishes, we make sure to get
dev
to a stable state, and then merge it intostaging
once again. This should be easy since I did the main merge before, so there shouldn't be any extra changesets to worry about. -
Partners start to test on staging.
-
We continue to work on
dev
, merging it into staging whenever we feel it's stable enough.
Does this sound right?