[Rev 03] RFR: merge-bot: create integrateable pull requests

[Robin Westberg]

On Thu, 2 Apr 2020 14:41:47 GMT, Erik Helin <ehelin at openjdk.org> wrote:

>> Hi all,
>> 
>> please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version
>> of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This
>> should reduce the overhead quite a bit for resolving a merge conflict.  With the new workflow a contributor would have
>> to something like the following (assuming they have a remote named `openjdk-bot`):
>> $ git fetch openjdk-bot
>> $ git checkout openjdk-bot/17
>> $ git merge <target branch>
>> $ # fix merge conflicts
>> $ git add -u
>> $ git commit -m "Merge <from branch>"
>> $ git push
>> 
>> Testing:
>> - `make test`
>> - Updated unit tests
>> 
>> Thanks,
>> Erik
>
> Erik Helin has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Add a test

Looks good!

bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java line 669:

> 668:
> 669:             //System.out.println(pr.comments());
> 670:             //for (var entry : pr.checks(pr.headHash()).entrySet()) {

Remove?

-------------

Marked as reviewed by rwestberg (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/557