[jdk11u-dev] RFR: 8195675: Call to insertText with single character from custom Input Method ignored [v3]
Steven Loomis
srl at openjdk.org
Mon Dec 2 22:25:55 UTC 2024
On Mon, 4 Nov 2024 16:29:27 GMT, Steven Loomis <srl at openjdk.org> wrote:
>> @srl295 Could not automatically backport b8f2ec90 to openjdk/jdk11u-dev due to conflicts in the following files:
>>
>> src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
>> Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.
>>
>> # Fetch the up-to-date version of the target branch
>> $ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master
>>
>> # Check out the target branch and create your own branch to backport
>> $ git checkout master
>> $ git checkout -b backport-srl295-b8f2ec90-master
>>
>> # Fetch the commit you want to backport
>> $ git fetch --no-tags https://git.openjdk.org/jdk.git b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
>>
>> # Backport the commit
>> $ git cherry-pick --no-commit b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
>> # Resolve conflicts now
>>
>> # Commit the files you have modified
>> $ git add files/with/resolved/conflicts
>> $ git commit -m 'Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd'
>> Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd.
>>
>> Below you can find a suggestion for the pull request body:
>>
>> Hi all,
>>
>> This pull request contains a backport of commit b8f2ec90 from the openjdk/jdk repository.
>>
>> The commit being backported was authored by Steven Loomis on 28 May 2024 and was reviewed by Phil Race.
>>
>> PR: https://github.com/openjdk/jdk/pull/17921
>>
>> Thanks!
>
> Steven Loomis has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains three additional commits since the last revision:
>
> - 8195675: merge from master
> - 8195675: empty commit to trigger build
> - Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
Any update on triage?
-------------
PR Comment: https://git.openjdk.org/jdk11u-dev/pull/2954#issuecomment-2513080824
More information about the jdk-updates-dev
mailing list