[Development] Which branch to commit patch

Daniel Levin dendy.ua at gmail.com
Sun Sep 6 20:25:39 CEST 2015


In Git fixup commits should be rebased onto lowest revision, ideally the
one that introduced bug. So it can be merged into nested branches later. If
issue was added into 5.3 then that is your rebase point.

On Sun, Sep 6, 2015 at 8:27 AM, Allan Sandfeld Jensen <kde at carewolf.com>
wrote:

> On Sunday 06 September 2015, Kurt Pattyn wrote:
> > Hi,
> >
> > I have resolved a DoS vulnerability in the Qt WebSockets module (see
> > https://bugreports.qt.io/browse/QTBUG-48123). Which branch should I
> commit
> > this patch to: 5.3, 5.4, 5.5, 5.6 or dev? This issue is present from the
> > very first version (since Qt 5.3).
> >
> I would suggest 5.5, as it is a bug-fix and 5.5 is current stable.
>
> `Allan
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20150906/5ada2fcf/attachment.html>


More information about the Development mailing list