[Gluster-devel] Reminder on backporting patches to the 3.7 or other stable branches

[Niels de Vos]

On Wed, May 06, 2015 at 02:44:11PM +0530, Atin Mukherjee wrote:
> 
> 
> On 05/06/2015 02:40 PM, Niels de Vos wrote:
> > Hi,
> > 
> > many patches need to get backported from the master branch to
> > release-3.7 or older stable releases. It helps reviewers and maintainers
> > enourmously if the backports are in some kind of standardized format.
> > The wiki contains the workflow for doing a backport [1], and I have just
> > added a link to an example of the format I like [2].
> > 
> > The most important items on the checklist for a backport are:
> >  - a dedicated bug must be used for the branch of the backport, so there
> >    should be one bug for the master branch, and one per backport/version
> +1, I do see lot of 3.7 patches which have same mainline BZs tagged and
> unfortunately they have been merged :(
> >  - the commit message of the backport should point to the original patch
> >  - the metadata/tags of the original patch should be indented/prefixed
> >    with "> " or similar, or be removed completely
> > 
> > Remember that backports are only merged in release-* branches when the
> > change is availeble in the master branch. When your backport depends on
> > other backports, please help with reviewing the dependent patches.
> > 
> > Also [1] is a wiki page, feel free to improve the contents, add more
> > details or examples.
> If you are backporting using the new gerrit web interface, then the
> topic has to be set explicitly. I've been a victim of this when I did it
> for the first time.

I've not tried that yet. Maybe you can add the steps to do it through
the webui in the wiki page?

Thanks!

> > 
> > Thanks,
> > Niels
> > 
> > 1. http://www.gluster.org/community/documentation/index.php/Backport_Guidelines
> > 2. https://github.com/gluster/glusterfs/commit/40407afb529f6e5fa2f79e9778c2f527122d75eb
> > 
> > 
> > 
> > _______________________________________________
> > Gluster-devel mailing list
> > Gluster-devel at gluster.org
> > http://www.gluster.org/mailman/listinfo/gluster-devel
> > 
> 
> -- 
> ~Atin