[Scummvm-devel] Release 1.3.0 schedule

[Tarek Soliman]

On Tue, Apr 19, 2011 at 05:16:53PM +0200, Max Horn wrote:
> 
> Am 19.04.2011 um 15:56 schrieb Eugene Sandulenko:
> 
> > On 19 April 2011 16:23, Johannes Schickel <lordhoto at scummvm.org> wrote:
> >> I just noticed one thing about the schedule: Since we have git now can't we
> >> just branch right ahead and only freeze that branch? Working with branches
> >> should be much better now (right?), so it seems there is no real reason to
> >> freeze our master branch.
> > Could you please provide a workflow for backporting the changes in this case?
> > 
> 
> Maybe looking at <http://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html> will be helpful, we can pick up some of the suggestions there.

This is suggesting not needing to backport because you would actually
be committing fixes to the maint branch and periodically merging
maint with master.

Cherry-picking is being proposed as the exception here for "mistakes".

This sort of dismisses the idea of having a change "only in a release"
which relates to the configure issue.
-- 
Tarek