Re: [matplotlib-devel] master vs maintenance branches (current process and proposal for future workflow)

[Thomas K. <th...@kl...>]

On 12 November 2012 20:52, Benjamin Root <ben...@ou...> wrote:

> There are other git workflows, which are all perfectly valid.  If you can
> convince us to use another, feel free to propose one.  However, we have
> done a couple of releases with gitwash, and it has worked quite well for us
> given how small our maintenance overhead is.  Just have to remember to
> regularly merge the maintenance branch to master.  That's all.


For what it's worth, what Paul describes is essentially the process we use
in IPython. All pull requests target master, and critical fixes are
backported if we decide we're going to do another maintenance release. This
is easier for contributors, because all pull requests work the same way,
but I think it does take some time for someone to go through the issues
tagged for backporting and cherry-pick the commits. Min tackled that for
our recent maintenance releases.

We use pull request testing to keep master reasonably stable, although we
don't make any promises about it.

Best wishes,
Thomas