Skip to content

Commit

Permalink
8320763: Fix spacing arround assignment in spec.gmk.in
Browse files Browse the repository at this point in the history 
Reviewed-by: erikj, iris
  • Loading branch information
@magicus
magicus committed Nov 27, 2023
1 parent 12e983a commit f0a12c5
Showing 1 changed file with 351 additions and 351 deletions.
Loading

3 comments on commit f0a12c5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@fthevenet
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on f0a12c5 Dec 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fthevenet Could not automatically backport f0a12c57 to openjdk/jdk21u-dev due to conflicts in the following files:

  • make/autoconf/spec.gmk.in

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-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/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-fthevenet-f0a12c57

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git f0a12c571b3c2e7f5c1cdadb70742f27a69f93e3

# Backport the commit
$ git cherry-pick --no-commit f0a12c571b3c2e7f5c1cdadb70742f27a69f93e3
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport f0a12c571b3c2e7f5c1cdadb70742f27a69f93e3'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport f0a12c571b3c2e7f5c1cdadb70742f27a69f93e3.

Please sign in to comment.