[Bf-committers] Committing fixes for releases in stabilizing branch.

[Campbell Barton]

On Mon, 2019-10-14 at 07:32 +0300, Nathan 'jesterKing' Letwory wrote:
> On Mon, 14 Oct 2019 at 03:39, Campbell Barton <ideasman42 at gmail.com>
> wrote:
> > - How to handle fixes that are first made to master,
> >   and later on we find should be applies to the stable branch
> >   (merge? cherry pick?).
> 
> To make merging process as clean as possible I would say revert in
> master,
> apply to stable, merge down to master.
> 
> 
> > - How to handle fixes that backfire
> >   (eg, a fix we make in the stable branch, then cause issues,
> >   then we want to remove from the stable branch but keep in
> master).
> 
> What kind of backfire are you talking about?

A fix that needs to be removed from the stable branch
(typically because it causes unforeseen problems).

> 
> > - How strict are we on merging immediately after committing
> >   to the
> > stable branch?
> >   So far there has been some accumulation of multiple commits
> >   to the stable branch which then get merged.
> >
> >   Is it discouraged to push multiple fix commits,
> >   then a merge afterwards?
> 
> Since the assumption is a commit per fix it'd be ideal to merge down
> to
> master once the fix is in stable.
> 
> /Nathan
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> https://lists.blender.org/mailman/listinfo/bf-committers