[jdk8u-dev] RFR: 8257620: Do not use objc_msgSend_stret to get macOS version
Olga Mikhaltsova
omikhaltcova at openjdk.org
Tue Nov 22 18:03:25 UTC 2022
On Tue, 22 Nov 2022 17:18:56 GMT, Ben Taylor <btaylor at openjdk.org> wrote:
>> This backports [JDK-8257620](https://bugs.openjdk.org/browse/JDK-8257620) for parity with Oracle JDK8 and OpenJDK 11+.
>>
>> The backport is not clean because [JDK-8269850](https://bugs.openjdk.org/browse/JDK-8269850) was applied first in 8u. If that change is backed out and reapplied after this backport, both are clean.
>>
>> Change applied with:
>> - `git revert 43cfe27fa3a11dd6d4fffcb1c1336ac7fdd0233b` (backout JDK-8269850)
>> - `git backport --from https://github.com/openjdk/jdk d4c7db5060978302382549246f9ad6831f19377d` (apply JDK-8257620)
>> - `git backport --from https://github.com/openjdk/jdk 3b1b8fc646493eae5f4df828afe29abb75fa5e60` (re-apply JDK-8269850)
>> - `git rebase -i HEAD~3` (squash commits)
>
> I think the reason your backport was unclean is related to these 2 lines:
>
> warning: inexact rename detection was skipped due to too many files.
> warning: you may want to set your merge.renamelimit variable to at least 66423 and retry the command.
>
> I believe if you follow the instructions in the warning and raise the rename limit, inexact rename detection will find the correct file and no manual resolution will be required - that's what happened for me, at least.
@benty-amzn Thanks for this tip!
`git config merge.renameLimit 70000` really helps to avoid manual resolving.
-------------
PR: https://git.openjdk.org/jdk8u-dev/pull/153
More information about the jdk8u-dev
mailing list