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

941: Warn about required merge after dependent PR integration #1134

Closed
wants to merge 3 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 22, 2021

When a dependent PR has been integrated, post an instructional message on how to merge these changes.


Progress

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

Issue

  • SKARA-941: Warn about required merge after dependent PR integration

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1134

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 22, 2021

👋 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. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title 941 941: Warn about required merge after dependent PR integration Apr 22, 2021
@openjdk openjdk bot added the rfr label Apr 22, 2021
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 22, 2021

The message looks like:

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout source
git fetch file:///private/var/folders/d6/1lm60n2x37z35d9y72zl88k80000gn/T/RepositoryTests11763809428403690025/hosted.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 22, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

941: Warn about required merge after dependent PR integration

Reviewed-by: erikj

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 1 new commit pushed to the master branch:

  • cbc8f3c: 981: Jira issue parser bails on space after URL

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 22, 2021
…ch/PullRequestBranchNotifier.java

Co-authored-by: Erik Joelsson <37597443+erikj79@users.noreply.github.com>
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 22, 2021

@erikj79 Thanks for reviewing!

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 22, 2021

@stefank As the original issue reporter, does this look reasonable to you?

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 23, 2021

/integrate

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

@openjdk openjdk bot commented Apr 23, 2021

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

  • 1b3f3f0: 991: Add 8u270 to the hgupdater exclusion list
  • 0d49a4d: forge: GitHubRepository.canPush might return 404
  • cbc8f3c: 981: Jira issue parser bails on space after URL

Your commit was automatically rebased without conflicts.

Pushed as commit f084dc2.

💡 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