Re: [orion-dev] Process for converging on stable/release builds

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

> From: Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>
> I have some questions:  What do you mean
when you want to review 
> commits into the new stable branch?  Merge them over?  Or
cherry-pick them?

The most common scenario will be a merge. 

> I have a suggestion:  Each week make your branch (stable_70_S2
to 
> match how your build is named?) off of master.  Then you can
pull in
> new fixes you need to stabilize the stable build simultaneously in
> master and stable_*.

Yes, that was the idea, create a new branch off master.

> Also, I believe your most common case will be including all of 
> master, with the occasional exception.  In that exception case,
> probably better to do a revert of the questionable commit in the 
> stable_* branch than be forced to cherry-pick over most fixes that
are fine.

Yes that sounds like a good idea. This week we reverted
a commit in master before branching, but we could have instead branched
and reverted in the branch. That would be less disruptive overall. Thanks
for the suggestion...

John