# Branching PHP-5.5 - Thread: https://externals.io/message/63716 - Original archive: https://news-web.php.net/php.internals/63716 - Started by dsp@php.net on 2012-10-30T09:00:15+00:00 - Messages: 5 - Reply by email to internals@lists.php.net - More for agents: search with https://externals.io/search.md?q={query} · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt --- ## #63716 — dsp@php.net — 2012-10-30T09:00:15+00:00 URL: https://externals.io/message/63716#63716 Hi Internals, it's been a while since we started talking about PHP 5.5 and we are already a little bit late with my release plans. I've started reviewing the current master and came to the conclusion that it does make more sense to me to branch 5.5 of master for a few reasons: (1) Parts of master are still from SVN times making it very hard to figure out if they are already merged to 5.4 or not as they have different version numbers. (2) The release process aimed to make new features and changed available faster, so I want to make sure everything is included. (3) There would be 2500 unique commits to be reviewed that are different from 5.4 (because of the SVN import). Also we have barely BC breaks in master and nothing that cannot be fixed. In particular: 9e7ae3b Allow management of your own padding in openssl_encrypt/decrypt This changed a parameter from bool to long, but the value 1 is equivalent to passing bool to the former signature, therefore it is BC. f28c128 Return previous error handler when resetting the error handler This might lead to problems in case people are testing === to test the return value of `set_error_handler()` The rest looks fine to me. So I'll go ahead and start PHP-5.5 branch by Thursday from current master. I know we then have 4 active branches which is a pain to keep in sync and merge and I am open for suggestions. A first alpha is planned for Nov 22. We still accept new features, so no worries. Please note we are about 1 1/2 month late to the 5.4 release last year, so expect a final of 5.5 around April 2013. Please make sure that your changed to 5.5. that are not in 5.4 are in the NEWS entry. There are still a lot of changes missing in NEWS. Also we have 37 expected test failures and 2 test failures (on my machine). Regards David Soria Parra --- ## #63722 — Nikita Popov — 2012-10-30T18:09:30+00:00 URL: https://externals.io/message/63716#63722 · In reply to: #63716 > The rest looks fine to me. So I'll go ahead and start PHP-5.5 branch by > Thursday from current master. I know we then have 4 active branches > which is a pain to keep in sync and merge and I am open for suggestions. Could we maybe do the same as with 5.4 and make releases off master, only branching when we hit code freeze? I mean, the things that will land to master in the next few months will still all go into 5.5 (or?) so branching it now would make things only more complicated. Nikita --- ## #63736 — Kalle Sommer Nielsen — 2012-11-02T12:49:08+00:00 URL: https://externals.io/message/63716#63736 · In reply to: #63716 Hi David 2012/10/30 dsp@php.net > Hi Internals, > > it's been a while since we started talking about PHP 5.5 and we are > already a little bit late with my release plans. I've started reviewing > the current master and came to the conclusion that it does make more > sense to me to branch 5.5 of master for a few reasons: > It's been a while since I contributed anything to the core, however I remember what a mess it was to cross merge back in the CVS days and I honestly do not see a big reason to make a "bigger" mess by branching yet another version, I think we can easily cope with having 5.5 as the current master branch like we did with the original 6.0 so until 5.4 is gonna "retire" or go into security fixes only mode like 5.3 currently is, then I think it makes a little sense to do so. Now I realize that we are trying to speed up releases and I probably skipped a few discussions which will render my mail here void, but until 5.4 is in "security-fixes-only" mode then I think 5.5 should remain as the current master. -- regards, Kalle Sommer Nielsen kalle@php.net --- ## #63743 — jpauli — 2012-11-05T13:37:07+00:00 URL: https://externals.io/message/63716#63743 · In reply to: #63736 > Hi David > > 2012/10/30 dsp@php.net > > > […] > > It's been a while since I contributed anything to the core, however I > remember what a mess it was to cross merge back in the CVS days and I > honestly do not see a big reason to make a "bigger" mess by branching yet > another version, I think we can easily cope with having 5.5 as the current > master branch like we did with the original 6.0 so until 5.4 is gonna > "retire" or go into security fixes only mode like 5.3 currently is, then I > think it makes a little sense to do so. > > Now I realize that we are trying to speed up releases and I probably > skipped a few discussions which will render my mail here void, but until > 5.4 is in "security-fixes-only" mode then I think 5.5 should remain as the > current master. Hey :-) AFAIK, we cant afford BC Breaks in 5.5 Kalle, do you mean you'd like to commit to master and, when release time comes, create a branch from master and name it 5.5 ? (tagging it for releases) ? We have to be really carefull about breaks, I think we should leave master as the master branch and rebase commits from it to 5.5 branch choosing what we want to merge or not. What are git skilled people thinking ? Julien.P --- ## #63750 — Pierre Joye — 2012-11-05T18:33:06+00:00 URL: https://externals.io/message/63716#63750 · In reply to: #63736 hi, > Hi David > > […] > > It's been a while since I contributed anything to the core, however I > remember what a mess it was to cross merge back in the CVS days and I > honestly do not see a big reason to make a "bigger" mess by branching yet > another version, I think we can easily cope with having 5.5 as the current > master branch like we did with the original 6.0 so until 5.4 is gonna > "retire" or go into security fixes only mode like 5.3 currently is, then I > think it makes a little sense to do so. > > Now I realize that we are trying to speed up releases and I probably > skipped a few discussions which will render my mail here void, but until > 5.4 is in "security-fixes-only" mode then I think 5.5 should remain as the > current master. There is no question about 5.5 having its own branch or not, only when it has be done. And as 5.5 exists as of its 1st release, a branch is needed. Master remains the main development branch. Also git makes merges easier, most of the time. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org