On Thu, Jul 5, 2012 at 1:53 PM, Chiradeep Vittal <chiradeep.vit...@citrix.com> wrote: >> >> >> >>> However, several factors complicate that. First, >>> not all patches applied cleanly as the three different codebases were >>> often in very different places. Second, people are human, and I >>> imagine some commits just didn't make it. >> >>Sounds like something a tool would help with, but I don't know of said >>toolŠplugin for Jenkins, maybe? Seems like it shouldn't be too hard to >>look for similar commits to 2 different branches. >> >>Would this maybe be something that falls under a Maintainer to manage? >>e.g. for the Agent Maintainer, make sure /agent patches are applied to >>the last 3 release branches? > > That does sound like a lot of work. Does this mean the maintainer asks the > patch submitter to test against the last 3 release branches? >
So that was the old workflow. The current workflow IIRC is that all feature development happens in a topic branch with the aim of being moved back into master. Theoretically I suppose we'll branch for a release, but the idea is that releases should really come from master and not have such a complex branching scheme, so with the rare exception of a patching something in a release branch and then back to master should be the only thing that really is any greater than just patching master. --David
