RFR: Allow merge PRs with an exact hash
Magnus Ihse Bursie
ihse at openjdk.java.net
Mon Feb 22 13:31:35 UTC 2021
On Mon, 22 Feb 2021 09:35:52 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:
> Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself.
Looks good (minus the typo)
bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java line 206:
> 204: assertFalse(commits.contains(mergeHash));
> 206: // Author and committer should updated in the merge commit
// Author and committer should be updated in the merge commit
Marked as reviewed by ihse (no project role).
More information about the skara-dev