# PHP 5.4 branch? - Thread: https://externals.io/message/70657 - Original archive: https://news-web.php.net/php.internals/70657 - Started by Stas Malyshev on 2013-12-16T10:11:26+00:00 - Messages: 10 - 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 --- ## #70657 — Stas Malyshev — 2013-12-16T10:11:26+00:00 URL: https://externals.io/message/70657#70657 Hi! I see that with this commit: http://git.php.net/?p=php-src.git;a=commit;h=9db649f1a71a3603a6ff9dc6d597a7e28774f16f You've merged master into PHP 5.4. Why did you do that? This needs to be fixed ASAP (and may require force push rights to do cleanly, so CCing David too). -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 --- ## #70658 — David Soria Parra — 2013-12-16T10:15:37+00:00 URL: https://externals.io/message/70657#70658 · In reply to: #70657 I am also wondering why dmitry is merging from upstream instead of rebasing. >Hi! > >I see that with this commit: >http://git.php.net/?p=php-src.git;a=commit;h=9db649f1a71a3603a6ff9dc6d597a >7e28774f16f > >You've merged master into PHP 5.4. Why did you do that? This needs to be >fixed ASAP (and may require force push rights to do cleanly, so CCing >David too). >-- >Stanislav Malyshev, Software Architect >SugarCRM: http://www.sugarcrm.com/ >(408)454-6900 ext. 227 --- ## #70659 — David Soria Parra — 2013-12-16T10:20:57+00:00 URL: https://externals.io/message/70657#70659 · In reply to: #70657 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I've overwritten PHP-5.4 and master. Johannes and me can overwrite branches. If you need to, let me know and I hand out the necessary rights (carefully). > Hi! > > I see that with this commit: > http://git.php.net/?p=php-src.git;a=commit;h=9db649f1a71a3603a6ff9dc6d597a7e28774f16f > > You've merged master into PHP 5.4. Why did you do that? This needs > to be fixed ASAP (and may require force push rights to do cleanly, > so CCing David too). > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSrtQJAAoJEKSanlo0ToXKte4P/2irUtgksRUxgOnp5vznMfR1 oZ6yH55MJqJKMaigS4l6mqiaya+3emBqL47t7ZsmbylIhBEWdgsRlnEGM4fHa6/s fx+s51wgJEl0U152bmyssCoZZlK0NZsVUuHr9QLdBY5EgAff52Q8XMvh0fGpMdGm qChHIzt9jP7Ehc/Cuh38CZfZv8jjVvYSUtKqXoF4wl7cxa21USLT1pW8WB1m8PLk q5yBrS/JBB6LXkZoHzHMzLvqPOKYYpRdVoOtsrSP9Nuwl0P1fmmfl+2OuhUTW+Nb uMT8WA4e1E2H20Q+AEdDs53BK3U0ulSnX7kNqTjYsmFudrAWklDAYhEDNnDYwCL/ 1/RSZ0cDRaZ9oSx3rH5881lXc3wdtnNojU6XxIxce2slRi1pYUNWMkE+Ikc1ln4D hJIV964vOhggbYpiZ3BTrICX8TRrpzYs6bzOPspKNgTYT0CWTenBOXggSmRwBR89 MoZ9+RdIFxsnAe1vuP5Uw5TPCtZYFIc160qDIw0CJE/RPoehftpcZ9nKI+QZSvsv fItHYRF/Ms41DH61/qHisUeGuZCAxcvww7MFln82ER9xr5Mc3X6Nyt13WKOFDX27 97DCnLMEVOXLIOvatEEebX1Ok+hPWqt+Qr81oFHLbrW7vAzjkrjRaEFHL9iksOFU VhRXmJHE24RCJQ7pIRHI =M4V4 -----END PGP SIGNATURE --- ## #70660 — Joe Watkins — 2013-12-16T10:41:42+00:00 URL: https://externals.io/message/70657#70660 · In reply to: #70659 > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > I've overwritten PHP-5.4 and master. Johannes and me can overwrite > branches. If you need to, let me know and I hand out the necessary > rights (carefully). > > > > > […] > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.15 (GNU/Linux) > Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ > > iQIcBAEBAgAGBQJSrtQJAAoJEKSanlo0ToXKte4P/2irUtgksRUxgOnp5vznMfR1 > oZ6yH55MJqJKMaigS4l6mqiaya+3emBqL47t7ZsmbylIhBEWdgsRlnEGM4fHa6/s > fx+s51wgJEl0U152bmyssCoZZlK0NZsVUuHr9QLdBY5EgAff52Q8XMvh0fGpMdGm > qChHIzt9jP7Ehc/Cuh38CZfZv8jjVvYSUtKqXoF4wl7cxa21USLT1pW8WB1m8PLk > q5yBrS/JBB6LXkZoHzHMzLvqPOKYYpRdVoOtsrSP9Nuwl0P1fmmfl+2OuhUTW+Nb > uMT8WA4e1E2H20Q+AEdDs53BK3U0ulSnX7kNqTjYsmFudrAWklDAYhEDNnDYwCL/ > 1/RSZ0cDRaZ9oSx3rH5881lXc3wdtnNojU6XxIxce2slRi1pYUNWMkE+Ikc1ln4D > hJIV964vOhggbYpiZ3BTrICX8TRrpzYs6bzOPspKNgTYT0CWTenBOXggSmRwBR89 > MoZ9+RdIFxsnAe1vuP5Uw5TPCtZYFIc160qDIw0CJE/RPoehftpcZ9nKI+QZSvsv > fItHYRF/Ms41DH61/qHisUeGuZCAxcvww7MFln82ER9xr5Mc3X6Nyt13WKOFDX27 > 97DCnLMEVOXLIOvatEEebX1Ok+hPWqt+Qr81oFHLbrW7vAzjkrjRaEFHL9iksOFU > VhRXmJHE24RCJQ7pIRHI > =M4V4 > -----END PGP SIGNATURE----- > Morning Chaps, Sorry about that, that was me being a boob ... Thanks David, panic over :) Cheers Joe --- ## #70662 — Ferenc Kovacs — 2013-12-16T13:49:58+00:00 URL: https://externals.io/message/70657#70662 · In reply to: #70659 > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > I've overwritten PHP-5.4 and master. Johannes and me can overwrite > branches. If you need to, let me know and I hand out the necessary > rights (carefully). > > Hi David, could you double check? http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-5.4 5.4 still seems like as it would be master. -- Ferenc Kovács @Tyr43l - http://tyrael.hu --- ## #70664 — Ferenc Kovacs — 2013-12-16T14:04:47+00:00 URL: https://externals.io/message/70657#70664 · In reply to: #70662 > > > > On Mon, Dec 16, 2013 at 11:20 AM, David Soria Parra wrote: > > > […] > Hi David, > > could you double check? > http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-5.4 > 5.4 still seems like as it would be master. > > > > -- > Ferenc Kovács > @Tyr43l - http://tyrael.hu > I think this should be the HEAD of the 5.4 branch: http://git.php.net/?p=php-src.git;a=commit;h=68a73ce3c449622f729bae257d1ed42e54a1a839 -- Ferenc Kovács @Tyr43l - http://tyrael.hu --- ## #70667 — David Soria Parra — 2013-12-16T18:26:40+00:00 URL: https://externals.io/message/70657#70667 · In reply to: #70659 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 it looks like there is even more mess. I think laruence has accidentally merged before. I try to clean it up. Stas please verify that the new version is correct. This will miss out commit 330168a2477666212797095449029e78dcce0844 on PHP-5.4. People should be more aware of what they are doing. The merges in the repository are a mess and it's hard to wrap my head around who was merging was on his local machine from upstream or anything else. David > I've overwritten PHP-5.4 and master. Johannes and me can overwrite > branches. If you need to, let me know and I hand out the necessary > rights (carefully). > > > > > […] > > > […] > > > […] You've merged master into PHP 5.4. Why did you do that? This > > […] > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSr0XgAAoJEKSanlo0ToXK7WQP/iASp5JsJuAfeXEyXrqqb3sP 6pIxFq7grUBGkWdKn1vPUGVmN4xvlpE/gjBwKBumFcAGEuDg25L/NAeTtWtUJlb/ KnBllajrKmDKNefSxP9l1G54rO94km5nIYPiS53/XqalMjSbaNA27nDlYPyAyDpt IF0QsP+S0PaSEq4WwNGYoUCD3y9zPQ5JZ+bdkRqQtRrvbXXceAb0HtAzEMaUArFn 2bHb+VlSOalwu+L0CwrRiFNS3Y2bTMZV8q3cCUHO4C/Qy6JeuOy15szfOtlxqFyj Pe6jetrP7nOliGOrKWykdTeONxcb261NLWEI6itiKI+KHnq6+jkptHHG8Y9JskJv JxV/Szvh/Uj7mUi8BFXoxcK2IF6DbSrWQlRDl1+WI0iZkahFC4RjMt94Q3zZ7mhl B4oo4nFBFY4iaWmGExEd9TpbxOz+5FwuNbMm+4qghqcmqCK4oVyd4+IWl0LNHLqJ cjfCkX2QuTsvMhQAPesuA+jIgRMosUjgQbTfwg1nca2wH+JIR7XW2L5D0zKPeWT+ bf+6J69jYKzxG6pzv0BgJTgOTOgGW1Kn7a8ZKFavtQFuc69ku4qNZr3c7U00zJ0M /ewp+MU808jwMIvYaybnovDlEbTFrO+Brx76Ra1nrl5AHBivT6tJalCJGmyUZ9zq 4mGDe5TdWfTXnScBNLQw =E2iw -----END PGP SIGNATURE --- ## #70669 — Stas Malyshev — 2013-12-16T18:48:10+00:00 URL: https://externals.io/message/70657#70669 · In reply to: #70667 Hi! > it looks like there is even more mess. I think laruence has > accidentally merged before. I try to clean it up. Stas please verify > that the new version is correct. This will miss out commit > 330168a2477666212797095449029e78dcce0844 on PHP-5.4. People should be > more aware of what they are doing. The merges in the repository are a > mess and it's hard to wrap my head around who was merging was on his > local machine from upstream or anything else. Unfortunately, it still looks like 5.4 is not right. Look here: http://git.php.net/?p=php-src.git;a=log;h=refs/heads/PHP-5.4 You can still see a bunch of 5.5 commits. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 --- ## #70874 — Hannes Magnusson — 2013-12-25T20:00:04+00:00 URL: https://externals.io/message/70657#70874 · In reply to: #70669 > Hi! > > > […] > > Unfortunately, it still looks like 5.4 is not right. Look here: > http://git.php.net/?p=php-src.git;a=log;h=refs/heads/PHP-5.4 > > You can still see a bunch of 5.5 commits. Its been over a week.. I suspect this has been resolved? -Hannes --- ## #70875 — Stas Malyshev — 2013-12-25T21:05:37+00:00 URL: https://externals.io/message/70657#70875 · In reply to: #70874 Hi! > Its been over a week.. I suspect this has been resolved? Yes, thanks, it was rolled back to a last known good commit and everything seems to be fine now. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227