From: Rainer Jung Date: Fri, 9 Aug 2019 08:27:42 +0000 (+0000) Subject: Comment. X-Git-Tag: 2.4.41~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e6804da316425e58afea48b3fe98874902ee8a;p=thirdparty%2Fapache%2Fhttpd.git Comment. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864773 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 332989a01ef..7f56f67795a 100644 --- a/STATUS +++ b/STATUS @@ -164,6 +164,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1709121 2.4.x patch: svn merge -c 1709121 ^/httpd/httpd/trunk . +1: covener, jorton, + rjung: shouldn't the merging respect the "add" set flag? Otherwise it seems + impossible to merge a 0 value on top of a non-zero value. PATCHES/ISSUES THAT ARE BEING WORKED