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.

Sign up for GitHub

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

Jump to bottom

304: Squash additional commits into merge commits for merge PRs #519

Closed
wants to merge 4 commits into from
Closed

304: Squash additional commits into merge commits for merge PRs #519

wants to merge 4 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Mar 19, 2020 •
edited by openjdk bot

Hi all,

Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the PR.

Best regards,
Robin

Progress

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

Issue

  • SKARA-304: Squash additional commits into merge commits for merge PRs

Reviewers

  • Erik Helin (ehelin - Reviewer) ⚠️ Review applies to 978e08f

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 19, 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.

@mlbridge
Copy link

mlbridge bot commented Mar 19, 2020 •
edited

Webrevs

edvbld
edvbld reviewed Mar 19, 2020
View reviewed changes
Copy link
Member

@edvbld edvbld left a comment

Choose a reason for hiding this comment

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

Looks good in general, just a few inline comments!

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Show resolved Hide resolved
bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Outdated
}
}
if (mergeCommitIndex >= commits.size() - 1) {
ret.add("A Merge PR must contain a merge commit.");
Copy link
Member

Choose a reason for hiding this comment

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

Related to my previous comment, should the message be "A Merge PR must contain at least one merge commit and one non-merge commit"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, can update that.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java Show resolved Hide resolved
edvbld
edvbld approved these changes Mar 19, 2020
View reviewed changes
Copy link
Member

@edvbld edvbld left a comment

Choose a reason for hiding this comment

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

Looks good!

@openjdk
Copy link

openjdk bot commented Mar 19, 2020 •
edited

@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:

304: Squash additional commits into merge commits for merge PRs

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 have been 3 commits pushed to the master branch. Since 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 ac71433a60ad49675e897b75137adfc75f0f5965.

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

@openjdk openjdk bot added the ready label Mar 19, 2020
@rwestberg
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Mar 20, 2020
@openjdk openjdk bot added the integrated label Mar 20, 2020
@openjdk
Copy link

openjdk bot commented Mar 20, 2020

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

  • ac71433: 314: Add help command to git-pr
  • 19f319e: 320: Add "git skara version" command
  • 42caec1: 316: git-webrev does not work without origin remote

Your commit was automatically rebased without conflicts.

Pushed as commit 92d7d97.

@mlbridge
Copy link

mlbridge bot commented Mar 20, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 92d7d97
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-03-20 07:06:26 +0000
URL: https://git.openjdk.java.net/skara/commit/92d7d97a

304: Squash additional commits into merge commits for merge PRs

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java

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

@edvbld edvbld edvbld approved these changes

Assignees
No one assigned
Labels
bots integrated
Milestone
No milestone
2 participants
@rwestberg @edvbld