backport patches

[Stefan Eissing <st...@greenbytes.de>]

FYI: I just checked in a "patches" directory inside the 2.4.x branch. I hope it's not picked up in a source distribution.

If we keep patches for backports/hot-fixes here - instead of all over the world in not-secure http: locations - it should give us tracking and easier use, I hope. I am not fixed on names or structure here, just trying to keep patches where they belong and version them.

Cheers,

Stefan

AW: backport patches

[Plüm, Rüdiger, Vodafone Group <ru...@vodafone.com>]

+1

Regards

Rüdiger

> -----Ursprüngliche Nachricht-----
> Von: Yann Ylavic [mailto:ylavic.dev@gmail.com]
> Gesendet: Donnerstag, 12. Oktober 2017 13:24
> An: httpd-dev <de...@httpd.apache.org>
> Betreff: Re: backport patches
> 
> On Thu, Oct 12, 2017 at 1:18 PM, Plüm, Rüdiger, Vodafone Group
> > <ru...@vodafone.com> wrote:
> >
> >> -----Ursprüngliche Nachricht-----
> >> Von: Yann Ylavic [mailto:ylavic.dev@gmail.com]
> >> Gesendet: Donnerstag, 12. Oktober 2017 13:12
> >> An: httpd-dev <de...@httpd.apache.org>
> >> Betreff: Re: backport patches
> >>
> >> I like the idea, but since tags are copied from .x branches, they
> will
> >> also include the patches not yet in (heance not really related to the
> >> tag).
> >> A separate branches/2.4.x-patches wouldn't have this issue...
> >
> > Why below branches? Why not in parallel to trunk/ and branches/?
> 
> ^/httpd/httpd/patches/{trunk,2.4.x,...} works for me too.
> 
> Regards,
> Yann.

Re: backport patches

[Yann Ylavic <yl...@gmail.com>]

On Thu, Oct 12, 2017 at 1:18 PM, Plüm, Rüdiger, Vodafone Group
> <ru...@vodafone.com> wrote:
>
>> -----Ursprüngliche Nachricht-----
>> Von: Yann Ylavic [mailto:ylavic.dev@gmail.com]
>> Gesendet: Donnerstag, 12. Oktober 2017 13:12
>> An: httpd-dev <de...@httpd.apache.org>
>> Betreff: Re: backport patches
>>
>> I like the idea, but since tags are copied from .x branches, they will
>> also include the patches not yet in (heance not really related to the
>> tag).
>> A separate branches/2.4.x-patches wouldn't have this issue...
>
> Why below branches? Why not in parallel to trunk/ and branches/?

^/httpd/httpd/patches/{trunk,2.4.x,...} works for me too.

Regards,
Yann.

AW: backport patches

[Plüm, Rüdiger, Vodafone Group <ru...@vodafone.com>]

> -----Ursprüngliche Nachricht-----
> Von: Yann Ylavic [mailto:ylavic.dev@gmail.com]
> Gesendet: Donnerstag, 12. Oktober 2017 13:12
> An: httpd-dev <de...@httpd.apache.org>
> Betreff: Re: backport patches
> 
> > FYI: I just checked in a "patches" directory inside the 2.4.x branch.
> > I hope it's not picked up in a source distribution.
> 
> Maybe we could have branches/2.4.x-patches instead?
> 
> >
> > If we keep patches for backports/hot-fixes here - instead of all
> > over the world in not-secure http: locations - it should give us
> > tracking and easier use, I hope. I am not fixed on names or structure
> > here, just trying to keep patches where they belong and version
> > them.
> 
> I like the idea, but since tags are copied from .x branches, they will
> also include the patches not yet in (heance not really related to the
> tag).
> A separate branches/2.4.x-patches wouldn't have this issue...

Why below branches? Why not in parallel to trunk/ and branches/?
But in general I agree with your point that patches below branches/2.4.x/ is not the best idea for the reasons you state.

Regards

Rüdiger

Re: backport patches

[Yann Ylavic <yl...@gmail.com>]

> FYI: I just checked in a "patches" directory inside the 2.4.x branch.
> I hope it's not picked up in a source distribution.

Maybe we could have branches/2.4.x-patches instead?

>
> If we keep patches for backports/hot-fixes here - instead of all
> over the world in not-secure http: locations - it should give us
> tracking and easier use, I hope. I am not fixed on names or structure
> here, just trying to keep patches where they belong and version
> them.

I like the idea, but since tags are copied from .x branches, they will
also include the patches not yet in (heance not really related to the
tag).
A separate branches/2.4.x-patches wouldn't have this issue...

Re: backport patches

[Graham Leggett <mi...@sharp.fm>]

On 12 Oct 2017, at 11:50 AM, Stefan Eissing <st...@greenbytes.de> wrote:

> FYI: I just checked in a "patches" directory inside the 2.4.x branch. I hope it's not picked up in a source distribution.
> 
> If we keep patches for backports/hot-fixes here - instead of all over the world in not-secure http: locations - it should give us tracking and easier use, I hope. I am not fixed on names or structure here, just trying to keep patches where they belong and version them.

They definitely can’t go inside the v2.4.x branch, those branches are what we vote on when we make a release, meaning every time we voted we would be voting to formally release those patches at the same time.

Rather keep them in a separate branch outside of the httpd v2.4.x branch.

Regards,
Graham
—