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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge-bot: give each branch a new number as name #579

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Apr 15, 2020

Hi all,

please review this patch that makes the merge bot always increment its branch
names by one. The previous code (mistakenly) used the number of open pull
request, but that is not monotonically increasing. Since the merge bot does not
delete branches it has created, the number of branches should be monotonically
increasing 馃槃

Testing:

  • make test on Linux x64 passes

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/579/head:pull/579
$ git checkout pull/579

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 15, 2020

馃憢 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.

@mlbridge
Copy link

mlbridge bot commented Apr 15, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

openjdk bot commented Apr 15, 2020

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

merge-bot: give each branch a new number as name

Reviewed-by: rwestberg
  • 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.

鉃★笍 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 15, 2020
@edvbld
Copy link
Member Author

edvbld commented Apr 15, 2020

/integrate

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

openjdk bot commented Apr 15, 2020

@edvbld
Pushed as commit a5b7492.

@openjdk openjdk bot removed the rfr label Apr 15, 2020
@mlbridge
Copy link

mlbridge bot commented Apr 15, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: a5b7492
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-04-15 09:49:28 +0000
URL: https://git.openjdk.java.net/skara/commit/a5b74922

merge-bot: give each branch a new number as name

Reviewed-by: rwestberg

! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java

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