[core-workflow] Starting the improved workflow discussion again

[Donald Stufft]

On July 26, 2015 at 6:22:44 AM, Nick Coghlan (ncoghlan at gmail.com) wrote:
> On 25 July 2015 at 14:47, Brett Cannon wrote:
> > How would we handle
> > changes that require custom fixes in two branches? They just fix it in both
> > and we automatically handle the merge/revert steps?
>  
> I don't think it's a coincidence that there's a correlation between
> "project uses a pull request based workflow" and "project doesn't
> provide maintenance releases for past feature releases" :)

I think it is a coincidence (and in fact there are projects that use PRs
and multiple maintenance series). No matter what any system requires
some(one|thing) to trigger a patch against the other branches. There is
basically no difference between sending a PR in GitHub to a particular
series branch or submitting a CR in Gerrit to a different branch. GitHub
lets you do it entirely in the web interface for the simple case where
there are no merge conflicts even where you can create a PR that forward
merges the old branches in the UI.

Of course there’s also nothing preventing automation to be added here that
looks for changes to the old branches and automatically proposes a forward
merge as well.

Can you explain what you think the differences are between the multiple
systems that affect PRs differently than they affect the other systems
that makes it harder?

---  
Donald Stufft  
PGP: 7C6B 7C5D 5E2B 6356 A926 F04F 6E3C BCE9 3372 DCFA