Everything
php
Learn Community Releases The PHP Project
Home » Project » Newsgroups » php.internals » [!] Master merged into PHP-7.1 »

[!] Master merged into PHP-7.1

php.internals

Davey

9 years ago
Hey folks, I have a bit of a mystery on my hands. Yasuo brought to my attention last night that it looked like someone had merged master into the PHP-7.1 branch, and indeed when Joe and I tried to build today that was the case. Proof: https://github.com/php/php-src/blob/PHP-7.1/main/php_version.h Now, I used `git when-merged`[1] to figure out when it was merged and came up with the following commit: commit 4a3188f0935211332cc3a545673e882331b14504 Merge: dc9ae10 f41b69e Author: Yasuo Ohgaki <yohgaki@php.net> Date: Wed Aug 10 09:39:17 2016 +0900 However, the date on it is Aug 10, and I have video proof from Aug ~29th (RC1 build) that it wasn't there then. My local PHP-7.1 branch also does not have this commit, and it's last commit was: commit 50059639c86a10fe11d6ec3eec2e690ee77afccc Author: Davey Shafik <me@daveyshafik.com> Date: Wed Oct 5 13:07:47 2016 -0700 So that means it was merged in the last 8 days. Can anyone shed some light on: 1) when it was merged 2) who merged it 3) how the dates are messed up 4) how to fix it Also: at this point, I'd like to ask for NO FURTHER COMMITS TO THE 7.1 BRANCH while this is sorted out. Thanks all, - Davey [1] https://github.com/mhagger/git-when-merged

Lauri Kenttä

9 years ago
On 2016-10-13 20:16, Davey Shafik wrote:
> Can anyone shed some light on: > > 1) when it was merged > 2) who merged it > 3) how the dates are messed up
1) and 2) commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929 Merge: b0cacee 4b8bdac Author: Joe Watkins <krakjoe@php.net> Date: Mon Oct 10 12:17:11 2016 +0100 Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1 The dates are "messed up" because, as the commit says, Joe merged php-src to his local branch (and not the other way around). So the date that you got refers to the commit which brought PHP-7.2 into Joe's messed-up branch. I think the normal approach here would be to issue a statement, rename this branch to PHP-7.1-broken-blahblah and restart PHP-7.1 from the last good commit (4b8bdac) with some cherry-picking or re-merging.
-- Lauri Kenttä

Davey

9 years ago
On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kenttä <lauri.kentta@gmail.com> wrote:
> On 2016-10-13 20:16, Davey Shafik wrote: > >> Can anyone shed some light on: >> >> 1) when it was merged >> 2) who merged it >> 3) how the dates are messed up >> > > > 1) and 2) > > commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929 > Merge: b0cacee 4b8bdac > Author: Joe Watkins <krakjoe@php.net> > Date: Mon Oct 10 12:17:11 2016 +0100 > > Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1
How did you figure that out? :D Thanks for this :) - Davey

Lauri Kenttä

9 years ago
On 2016-10-13 22:32, Davey Shafik wrote:
> On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kenttä > <lauri.kentta@gmail.com> wrote: > >> On 2016-10-13 20:16, Davey Shafik wrote: >> >>> Can anyone shed some light on: >>> >>> 1) when it was merged >>> 2) who merged it >>> 3) how the dates are messed up >> >> 1) and 2) >> >> commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929 >> Merge: b0cacee 4b8bdac >> Author: Joe Watkins <krakjoe@php.net> >> Date: Mon Oct 10 12:17:11 2016 +0100 >> >> Merge branch 'PHP-7.1' of https://github.com/php/php-src into >> PHP-7.1 > > How did you figure that out? :D > > Thanks for this :) > > - Davey
Magic. ;) Actually I just followed the lines in the git graph: $ git log origin/PHP-7.1.0RC3 --oneline | head -n2 8fe9ea3 Update versions/dates for PHP 7.1.0RC3 36d5bed Merge branch 'PHP-7.0' into PHP-7.1 -> 36d5bed is known to be good, and luckily it's not too old. $ git log origin/PHP-7.1 --oneline --graph -> searched for 36d5bed and followed up the PHP-7.1 line, which is the one with "Merge branch 'PHP-7.0' into PHP-7.1" commits, whereas the other branch has "Merge branch 'PHP-7.1'" commits. I suppose git when-merged 36d5bed would do the trick, too.
-- Lauri Kenttä

Yasuo Ohgaki

9 years ago
On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kenttä <lauri.kentta@gmail.com> wrote:
> Actually I just followed the lines in the git graph: > > $ git log origin/PHP-7.1.0RC3 --oneline | head -n2 > 8fe9ea3 Update versions/dates for PHP 7.1.0RC3 > 36d5bed Merge branch 'PHP-7.0' into PHP-7.1 > -> 36d5bed is known to be good, and luckily it's not too old. > > $ git log origin/PHP-7.1 --oneline --graph > -> searched for 36d5bed and followed up the PHP-7.1 line, which > is the one with "Merge branch 'PHP-7.0' into PHP-7.1" commits, > whereas the other branch has "Merge branch 'PHP-7.1'" commits. > > I suppose git when-merged 36d5bed would do the trick, too.
git-when-merged worked well. MacBook-Pro:PHP-7.1 yohgaki$ git-when-merged -l 36d5bed refs/heads/PHP-7.1 8ee842b0ea0d94035fe584ca8a3213902bf663b2 commit 8ee842b0ea0d94035fe584ca8a3213902bf663b2 Merge: 160832e 1bc3e1b Author: Joe Watkins <krakjoe@php.net> Date: Fri Sep 30 07:23:19 2016 +0100 Merge branch 'master' of https://github.com/php/php-src MacBook-Pro:PHP-7.1 yohgaki$ git-when-merged --diff 36d5bed | wc -l 9596 It has almost 10k lines of diff, so this would be it. Davey, please let us know when PHP-7.1 branch is ready for new commits. I would like to add missing description in UPGRADING. Thank you,
-- Yasuo Ohgaki yohgaki@ohgaki.net

Joe Watkins

9 years ago
Afternoon all, urm ... sorry, I'm so terrible at git ... Cheers Joe On Thu, Oct 13, 2016 at 11:07 PM, Yasuo Ohgaki <yohgaki@ohgaki.net> wrote: