Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D7FA1200D31 for ; Sat, 4 Nov 2017 11:59:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D6733160BE7; Sat, 4 Nov 2017 10:59:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CCBAB160BD5 for ; Sat, 4 Nov 2017 11:59:54 +0100 (CET) Received: (qmail 37144 invoked by uid 500); 4 Nov 2017 10:59:53 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 37134 invoked by uid 99); 4 Nov 2017 10:59:53 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Nov 2017 10:59:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D2D1EE887C for ; Sat, 4 Nov 2017 10:59:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.897 X-Spam-Level: * X-Spam-Status: No, score=1.897 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RP_MATCHES_RCVD=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (1024-bit key) header.d=sharp.fm Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 9EzW28_ydFqU for ; Sat, 4 Nov 2017 10:59:51 +0000 (UTC) Received: from chandler.sharp.fm (chandler.sharp.fm [80.168.143.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 6211B5FCC7 for ; Sat, 4 Nov 2017 10:59:51 +0000 (UTC) Received: from [192.168.220.109] (unknown [192.168.220.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: minfrin@sharp.fm) by chandler.sharp.fm (Postfix) with ESMTPSA id 26EB61AF9AD for ; Sat, 4 Nov 2017 10:41:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 chandler.sharp.fm 26EB61AF9AD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharp.fm; s=default; t=1509792074; bh=STo+ZjiErt9ap9cdR3lHIjMPIcS+tDI7j+uT5cW+8hM=; h=From:Subject:Date:References:To:In-Reply-To:From; b=fo0sWVD9wKkqpMKnEfLC4/CBSuEeabVJwCCg7CWRRu4wUXZeB325l7HglMuzvXwY5 g+cMS23KnRNVU4408Ky16YCVfKy/SrkY+1Z4JCShGKw7j9qpDmm28FAQczjlCdV/66 ETXS75ODDE/Dda/tJme5lUL/2L2sLmUJw63ZVVuE= From: Graham Leggett Content-Type: multipart/signed; boundary="Apple-Mail=_7BD19C0F-E865-4FA3-AD0F-51F71FB0E7BD"; protocol="application/pkcs7-signature"; micalg=sha1 Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: We have soon 5 SVN repo's Date: Sat, 4 Nov 2017 12:59:44 +0200 References: <59fd9073.ccc.2048.42f2@land10.nl> To: dev@httpd.apache.org In-Reply-To: <59fd9073.ccc.2048.42f2@land10.nl> Message-Id: X-Mailer: Apple Mail (2.3273) archived-at: Sat, 04 Nov 2017 10:59:56 -0000 --Apple-Mail=_7BD19C0F-E865-4FA3-AD0F-51F71FB0E7BD Content-Type: multipart/alternative; boundary="Apple-Mail=_907FFEB7-2711-4D34-8849-1F9BD2986116" --Apple-Mail=_907FFEB7-2711-4D34-8849-1F9BD2986116 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 04 Nov 2017, at 12:03 PM, Steffen wrote: > Soon we have: >=20 > branches 2.4.x > trunk > 2.5.0-alpha > patches/2.4.x > patches/trunk >=20 > Please a procedure: where and when do we apply patches/fixes.=20 When: When you feel your change is appropriate, and when on = review-then-commit branches you have received three +1=E2=80=99s = including yours binding vote. Where: Read on. Everything starts on bleeding edge trunk, always, just as we always have = done. People propose backports to the older branches, in order, if people feel = those patches are warranted, just as we always have done. If a branch is commit-then-review (CTR), and you believe it is = appropriate to do so, you commit to that branch, and if people have a = problem with it, they will say so. If a branch is review-then-commit (RTC), and you believe it is = appropriate to do so, you propose a backport in STATUS and when you get = three +1=E2=80=99s (including your own binding one), you commit to that = branch. The changes cascade down the branches as far as you feel is appropriate. Concrete example. You have a change. You believe this change should be backported to = v2.4.x, so that people using the current v2.4.x line will see your = change. You commit it to trunk. You propose it for backport to = v2.5.0-alpha. You propose it for backport to v2.4.x. You could carry on = down to v2.2.x if you believe it is warranted, but you probably won=E2=80=99= t believe it is warranted for a branch that is end of life. What do we want? - All changes on v2.2.x should also appear in all higher branches and = trunk. - All changes on v2.4.x should also appear in all higher branches and = trunk. - All changes on v2.5.x should also appear in trunk. What _don=E2=80=99t_ we want? - Changes to appear on v2.4.x that _aren=E2=80=99t_ also made to v2.5.x. = For obvious reasons we don=E2=80=99t want things in v2.4.x to suddenly = vanish from v2.5/v2.6; except for - Code that only appears in older branches. For example if a module is = removed, you physically can=E2=80=99t patch it in trunk because it no = longer exists. In these rare cases you would propose a fix for an older = branch only. The rule here is =E2=80=9Cbe sensible=E2=80=9D. Nothing has changed in our process. Regards, Graham =E2=80=94 --Apple-Mail=_907FFEB7-2711-4D34-8849-1F9BD2986116 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 On 04 Nov 2017, at 12:03 PM, Steffen <info@apachelounge.com> wrote:

Soon we have:

branches 2.4.x
trunk
2.5.0-alpha
patches/2.4.x
patches/trunk

Please a procedure:  where and when do we apply = patches/fixes. 

When: When you feel your change is appropriate, = and when on review-then-commit branches you have received three +1=E2=80=99= s including yours binding vote.

Where:= Read on.

Everything starts on = bleeding edge trunk, always, just as we always have done.

People propose backports to the older branches, in = order, if people feel those patches are warranted, just as we always = have done.

If a branch is = commit-then-review (CTR), and you believe it is appropriate to do so, = you commit to that branch, and if people have a problem with it, they = will say so.

If a branch is = review-then-commit (RTC), and you believe it is appropriate to do so, = you propose a backport in STATUS and when you get three +1=E2=80=99s = (including your own binding one), you commit to that = branch.

The changes cascade down the = branches as far as you feel is appropriate.

Concrete example.

You have a change. You believe this change should = be backported to v2.4.x, so that people using the current v2.4.x line = will see your change. You commit it to trunk. You propose it for = backport to v2.5.0-alpha. You propose it for backport to v2.4.x. You = could carry on down to v2.2.x if you believe it is warranted, but you = probably won=E2=80=99t believe it is warranted for a branch that is end = of life.

What do we = want?

- All changes on v2.2.x should = also appear in all higher branches and trunk.
- All = changes on v2.4.x should also appear in all higher branches and = trunk.
- All changes on v2.5.x should also = appear in trunk.

What _don=E2=80=99t_ we want?

- Changes to appear on v2.4.x that = _aren=E2=80=99t_ also made to v2.5.x. For obvious reasons we don=E2=80=99t= want things in v2.4.x to suddenly vanish from v2.5/v2.6; except = for
- Code that only appears in older branches. For = example if a module is removed, you physically can=E2=80=99t patch it in = trunk because it no longer exists. In these rare cases you would propose = a fix for an older branch only. The rule here is =E2=80=9Cbe = sensible=E2=80=9D.

Nothing has changed in our process.

Regards,
Graham
=E2=80=94

= --Apple-Mail=_907FFEB7-2711-4D34-8849-1F9BD2986116-- --Apple-Mail=_7BD19C0F-E865-4FA3-AD0F-51F71FB0E7BD Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJkjCCBFow ggNCoAMCAQICDkfDEAAYncBBHJ8+VGhBMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkw FwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9i YWxTaWduIFJvb3QgQ0EwHhcNMTYwMzE2MDAwMDAwWhcNMjQwMzE2MDAwMDAwWjBUMQswCQYDVQQG EwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEqMCgGA1UEAxMhR2xvYmFsU2lnbiBQZXJz b25hbFNpZ24gMiBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApI90W+tZ 9DTdJalYb0LA6KxKGbAN8CYt8Zz1ldd90svVqx8iWOplKLb200obaswQ/emJx0QziEY16MAA1tsj jRZXO1BDtPq6jrEykHbfNe2BkjnBORpUPme4GAuuaINWPijjlvjwj6WkXWDlqjsN9tbtm6le9dcF vF/AgOSciXaV37QbpXvScullUkwvNXhOriD63bM5SoM26OuMP2yUlfmUKf6N8EVazi3jYcVcqdhU 5sZBUhmDuskqpIGaLu0TQnZTMWNPro96L/8805Y6BERW4ZBcEC4syOh16thPqVmw16CRVQ6N7X4i R7c+xGoYIlHsFbqeLfRl7tlROzzUiQIDAQABo4IBJTCCASEwDgYDVR0PAQH/BAQDAgEGMBIGA1Ud EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFGQ3lbeBRONanXgssgNROZ29AclRMB8GA1UdIwQYMBaA FGB7ZhpFDZfKiVAvfQTNNKj//P1LMD0GCCsGAQUFBwEBBDEwLzAtBggrBgEFBQcwAYYhaHR0cDov L29jc3AuZ2xvYmFsc2lnbi5jb20vcm9vdHIxMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwu Z2xvYmFsc2lnbi5jb20vcm9vdC5jcmwwRwYDVR0gBEAwPjA8BgRVHSAAMDQwMgYIKwYBBQUHAgEW Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBBQUAA4IB AQDK7tBLBj4Qa27yvrg59zX4b9mxSyulTdlWJH413FkTcsLEVRoTanOoBiqVfDV7cGr4XT1gziy7 anNStIT64/HjTZPYcrbEABmCyGlXR39ht/zMjqH23LXm2o6Yk464t9eN+BoCBfRwsqmC7cFvyxFQ wm5wfwQYa0EV7ObwGyUFdLALmRSscvhxlXe+l7/YjdYodbxGQ73d7+Loo+fFpboUYmzIZPXA489W WKwAOM0n6GpCAvuFfFhQHLUH+/6ooceSQQlrX4l52jkfqqmZ95/AUSR0YUlj6UW8653iQspU+YLO +sxOIqUi+ASGZ58eBeHnIn+RQ9BRSe27/xAkj/4tMIIFMDCCBBigAwIBAgIMZA5q7n651Y54SO7S MA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNh MSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzMwHhcNMTYxMDAyMjIw MzU1WhcNMTkxMjI3MjExMjI2WjCBizELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0G A1UEBxMGTG9uZG9uMSAwHgYDVQQKExdQZXBwZXJwb3QgTWVkaWEgTGltaXRlZDEXMBUGA1UEAxMO R3JhaGFtIExlZ2dldHQxHzAdBgkqhkiG9w0BCQEWEG1pbmZyaW5Ac2hhcnAuZm0wggEiMA0GCSqG SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/PUGcalLpGPw7MDbcDkwtkjhw2s2e0SI+tFmGHcv4DSOe hABLH2p6ZiwefzkRWpYq7TU6u2woGgcLj0APygZK+Iqd8qZOLYMCRGktEvd0lZ3XOlyimx1Ryj9U gJ9HzyMkwSCNMqruQeeb2CFV8d9MJfDKF9kJSgLl/bTzok4WW8JT+3zVYA8yd7SPV6TbBq+qv6JI UmkOvQ5gMBjiONU+yWBs16KPNNXO+YRNFfoJ5BWi8o+zPK2rBuF/JL7Vp/y4jLMqih+F0zogdvcq eeNdi0OK4Re1v/7+/KQh6f05HFZmttUx1cW0ctnI9bOJW9aVwSyMV/uom9QOjbV+RDFJAgMBAAGj ggHIMIIBxDAOBgNVHQ8BAf8EBAMCBaAwgZYGCCsGAQUFBwEBBIGJMIGGMEkGCCsGAQUFBzAChj1o dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc3BlcnNvbmFsc2lnbjJnM29jc3Au Y3J0MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3NwZXJzb25hbHNp Z24yZzMwTQYDVR0gBEYwRDBCBgorBgEEAaAyASgKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3 Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwQwYDVR0fBDwwOjA4oDagNIYy aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc3BlcnNvbmFsc2lnbjJnMy5jcmwwGwYDVR0R BBQwEoEQbWluZnJpbkBzaGFycC5mbTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYD VR0OBBYEFJh++Vtb6wHW9L+6XkWLTDNsn+O5MB8GA1UdIwQYMBaAFGQ3lbeBRONanXgssgNROZ29 AclRMA0GCSqGSIb3DQEBBQUAA4IBAQCZvvCBwBIdjXZ8nLQ3nFmKt1rC/Qj9ey4afRxD6vUJ4+6h h5E4G642uyfmUepQzOfPQL28c6sd8BsbuyoyNzcpDuxQyNAG0GIvtdp3g8CapsXKNCZ2QvpIE1uN gDdQhS6uj4Iw6BVpV3cklsTZzwULMV6mpYXMG4kDQtKxXQj7QByrbJEk+TDuoaYn5AAiz7AQwsiC Gyqe6PnVMWbh4cKdAvN/SztmvL4f7+dmEcwyWHyIaZYyG1ctQYxjFlydHUaDE8RJDoT/SsQZWNVq r3yj2jgLFpFsHGzyW/ueaZIA5fs048SLZf75AVFOE892MhQ6TQ7oD7oagtb0O7gGM/QFMYIC2DCC AtQCAQEwZDBUMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEqMCgGA1UE AxMhR2xvYmFsU2lnbiBQZXJzb25hbFNpZ24gMiBDQSAtIEczAgxkDmrufrnVjnhI7tIwCQYFKw4D AhoFAKCCAUkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTcxMTA0 MTA1OTQ0WjAjBgkqhkiG9w0BCQQxFgQUyUwvLuKBX1gaMO2B1LfLZ1FIUJswcwYJKwYBBAGCNxAE MWYwZDBUMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEqMCgGA1UEAxMh R2xvYmFsU2lnbiBQZXJzb25hbFNpZ24gMiBDQSAtIEczAgxkDmrufrnVjnhI7tIwdQYLKoZIhvcN AQkQAgsxZqBkMFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYD VQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzMCDGQOau5+udWOeEju0jANBgkq hkiG9w0BAQEFAASCAQCI0f3seBfJwPZbLJxf1BIQwtiid15FsH2Gw+1sPFPdHqfvZFAEObXuyjFd HERBepzYlcUISm410W3fADSRtXwSe6ncfj+RpJ91MN2TBbR0UkgwtLPb3z2YvqlWiCjiVJRpLyQL uHQdjq3xZZGqaU1BspCt+rEahT5FMi6Z+3Mk3kDyIXCme06Tcic+SLk7Qt4PcrpX0DkYa3q6Ujom bEMM9PsItn8/MbSmtuVkX956rs2Wl5O4F8TdZi8a8/T/28LJuTxrFgiYaz33i3kGRnxm8AO/fumg RIrTi2s4j+V640Z6XaYC1klHIL8YqBqb6t6sGNrQKIDeDFRxFty07B9+AAAAAAAA --Apple-Mail=_7BD19C0F-E865-4FA3-AD0F-51F71FB0E7BD--