Mailing List Archive

Re: svn commit: r1893530 - /httpd/httpd/branches/2.4.x/STATUS
> Am 23.09.2021 um 09:25 schrieb rpluem@apache.org:
>
> Author: rpluem
> Date: Thu Sep 23 07:25:24 2021
> New Revision: 1893530
>
> URL: http://svn.apache.org/viewvc?rev=1893530&view=rev
> Log:
> * Comment [skip ci]
>
> Modified:
> httpd/httpd/branches/2.4.x/STATUS
>
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1893530&r1=1893529&r2=1893530&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Sep 23 07:25:24 2021
> @@ -163,6 +163,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> http://svn.apache.org/1893220
> 2.4.x patch: svn merge -c 1893214,1893215,1893220 ^/httpd/httpd/trunk .
> +1: icing,
> + rpluem says: This one has merge conflicts.

Arg. modules/http2 in 2.4.x and trunk have been gone out of sync
and I am wading through changesets that have never been backported
and cause the newer changes to give merge conflicts.

FTR: I hate our trunk development model.