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

vcs: only convert tags that are part of branch #988

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jan 20, 2021

Hi all,

please review this patch that ensures that the GitToHgConverter only converts tags that are pointing to commits on the branch the converter is converting.

Thanks,
Erik


Progress

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

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 20, 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 added the rfr label Jan 20, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 20, 2021

Webrevs

Copy link
Member

@rwestberg rwestberg 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 Jan 20, 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:

vcs: only convert tags that are part of branch

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 4 new commits pushed to the master branch:

  • c972718: 867: Your git version is: 2.30.0.284...., which is not a known ...
  • 06e31a8: 749: If an integration fails at a late stage, it will both say that it succeeded and failed
  • 5b299d8: mlbridge: use bot email address when auto-closing PRs
  • 8f85cb4: 681: No (obvious) way to remove "test-request" label

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 Jan 20, 2021
@edvbld
Copy link
Member Author

edvbld commented Jan 21, 2021

/integrate

@openjdk openjdk bot closed this Jan 21, 2021
@openjdk openjdk bot added integrated and removed ready labels Jan 21, 2021
@openjdk
Copy link

openjdk bot commented Jan 21, 2021

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

  • cd5442c: backports: handle original commit without issues
  • 277d620: checkout: refine logging levels
  • c972718: 867: Your git version is: 2.30.0.284...., which is not a known ...
  • 06e31a8: 749: If an integration fails at a late stage, it will both say that it succeeded and failed
  • 5b299d8: mlbridge: use bot email address when auto-closing PRs
  • 8f85cb4: 681: No (obvious) way to remove "test-request" label

Your commit was automatically rebased without conflicts.

Pushed as commit fa6ac0e.

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

@openjdk openjdk bot removed the rfr label Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants