Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

993: Stuck merge PR (Panama) #1138

Closed
wants to merge 1 commit into from
Closed

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Apr 23, 2021

Hi all,

please review this patch that makes the merge bot use the /integrate auto feature. The merge bot have previously had issues when it should have re-issued an /integrate command due to the pull request source branch being updated by a human. These concerns go away if the merge bot instead rely on the /integrate auto feature.

I also opted to make the /sponsor command a bit more lenient when a user has issued /integrate auto. If a user has run /integrate auto then a sponsor can sponsor the PR as soon as it is ready, they don't have to wait for the bots to add the /integrate comment.

Thanks,
Erik


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1138/head:pull/1138
$ git checkout pull/1138

Update a local copy of the PR:
$ git checkout pull/1138
$ git pull https://git.openjdk.java.net/skara pull/1138/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1138

View PR using the GUI difftool:
$ git pr show -t 1138

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1138.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 23, 2021

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title skara-993 993: Stuck merge PR (Panama) Apr 23, 2021
@openjdk openjdk bot added the rfr label Apr 23, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 23, 2021

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

openjdk bot commented Apr 23, 2021

@edvbld This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

993: Stuck merge PR (Panama)

Reviewed-by: rwestberg

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • f084dc2: 941: Warn about required merge after dependent PR integration
  • 1b3f3f0: 991: Add 8u270 to the hgupdater exclusion list

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Apr 23, 2021
@edvbld
Copy link
Member Author

edvbld commented Apr 27, 2021

/integrate

@openjdk openjdk bot closed this Apr 27, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 27, 2021
@openjdk
Copy link

openjdk bot commented Apr 27, 2021

@edvbld Since your change was applied there have been 2 commits pushed to the master branch:

  • f084dc2: 941: Warn about required merge after dependent PR integration
  • 1b3f3f0: 991: Add 8u270 to the hgupdater exclusion list

Your commit was automatically rebased without conflicts.

Pushed as commit 4d271a0.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants