You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/19 08:04:51 UTC
svn commit: r1821594 - /httpd/httpd/branches/2.4.x/STATUS

Author: ylavic
Date: Fri Jan 19 08:04:51 2018
New Revision: 1821594

URL: http://svn.apache.org/viewvc?rev=1821594&view=rev
Log:
Better event *merge* staging.

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=1821594&r1=1821593&r2=1821594&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Jan 19 08:04:51 2018
@@ -197,23 +197,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 shortage
      trunk patch: http://svn.apache.org/r1605328
                   http://svn.apache.org/r1629576
-     seq patch 1: http://home.apache.org/~ylavic/patches/event-staging-1_on_4.patch
-                  http://svn.apache.org/r1643279
+       2.4.x 1/4: http://home.apache.org/~ylavic/patches/event-staging-1_on_4.patch
+                  svn merge --record-only -c 1605328,1629576 .
+     trunk patch: http://svn.apache.org/r1643279
                   http://svn.apache.org/r1703241
                   http://svn.apache.org/r1802535
                   http://svn.apache.org/r1819847
                   http://svn.apache.org/r1819848
                   http://svn.apache.org/r1819852
                   http://svn.apache.org/r1819853
-     seq patch 2: http://home.apache.org/~ylavic/patches/event-staging-2_on_4.patch
-                  http://svn.apache.org/r1819855
+       2.4.x 2/4: http://home.apache.org/~ylavic/patches/event-staging-2_on_4.patch
+                  svn merge --record-only -c 1643279,1703241,1802535,1819847,1819848,1819852,1819853 .
+     trunk patch: http://svn.apache.org/r1819855
                   http://svn.apache.org/r1821562
-     seq patch 3: http://home.apache.org/~ylavic/patches/event-staging-3_on_4.patch
-                  http://svn.apache.org/r1821558
+       2.4.x 3/4: http://home.apache.org/~ylavic/patches/event-staging-3_on_4.patch
+                  svn merge --record-only -c 1819855,1821562 .
+     trunk patch: http://svn.apache.org/r1821558
                   http://svn.apache.org/r1821561
-     seq patch 4: http://home.apache.org/~ylavic/patches/event-staging-4_on_4.patch
-     2.4.x patch: the above patches in order and then:
-                  svn merge --record-only -c 1605328,1629576,1643279,1703241,1802535,1819847,1819848,1819852,1819853,1819855,1821562,1821558,1821561 .
+       2.4.x 4/4: http://home.apache.org/~ylavic/patches/event-staging-4_on_4.patch
+                  svn merge --record-only -c 1821558,1821561 .
+     (2.4.x full: http://home.apache.org/~ylavic/patches/event-staging-full.patch)
      +1: ylavic,