httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jacob Champion <>
Subject Re: svn commit: r1756556 - /httpd/httpd/branches/2.4.x/STATUS
Date Wed, 17 Aug 2016 17:08:32 GMT
On 08/16/2016 03:29 PM, wrote:
>    *) autoconf: minor cleanup and removal of some dead code.
>       trunk patch:
>       +1: jchampion
> +     ylavic: some conflicts with r1753315 in 2.4.x's

Trunk has config files that aren't present in 2.4.x, so the massive list 
of "files to generate" conflicts.

What's the procedure for dealing with this in STATUS when I propose 
something? A 2.4.x patch hosted... somewhere? Or do we just rely on 
proper manual resolution by whoever merges the patches?


View raw message