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

375: Improve Merge PR RFR email #591

Closed
wants to merge 8 commits into from
Closed

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 21, 2020

Hi all,

Please review this change that improves the RFR emails sent out for Merge PRs.

Best regards,
Robin


Progress

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

Issue

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591
$ git checkout pull/591

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 21, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 21, 2020

/solves 376

@openjdk
Copy link

@openjdk openjdk bot commented Apr 21, 2020

@rwestberg Command syntax: /solves [add|remove] <id>[,<id>,...] or /issue [add] <id>: <description>. For example:

  • /solves add JDK-1234567,4567890
  • /solves remove JDK-4567890
  • /solves 1234567: Use this exact title

If issues are specified only by their ID, the title will be automatically retrieved from JBS. The project prefix (JDK- in the above examples) is optional. Separate multiple issue IDs using either spaces or commas.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 21, 2020

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2020

@rwestberg this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout merge_pr_rfr
git fetch https://git.openjdk.java.net/skara master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

# Conflicts:
#	bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
@openjdk openjdk bot removed the merge-conflict label Apr 22, 2020
edvbld
edvbld approved these changes Apr 23, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Apr 23, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

375: Improve Merge PR RFR email

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to 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 automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 0c381067fd84047527d5b2a1c610a56d16266c8c.

➡️ 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, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 23, 2020

/integrate

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

@openjdk openjdk bot commented Apr 23, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 0c38106: Python 3 compatibility for mercurial extension

Your commit was automatically rebased without conflicts.

Pushed as commit b7f30b5.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 23, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: b7f30b5
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-04-23 07:07:45 +0000
URL: https://git.openjdk.java.net/skara/commit/b7f30b58

375: Improve Merge PR RFR email

Reviewed-by: ehelin

! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java
! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java
+ bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/LabelerWorkItem.java
- bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java
+ forge/src/main/java/org/openjdk/skara/forge/CommitFailure.java
! forge/src/main/java/org/openjdk/skara/forge/HostedRepositoryPool.java
+ forge/src/main/java/org/openjdk/skara/forge/PullRequestUtils.java

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