1076: Not possible to use 'Backport <sha>' if original bug doesn't have public sha #1186
Conversation
|
|
openjdk
bot
changed the title
Webrevs
|
| @@ -299,6 +299,37 @@ public String toString() { | |||
| } | |||
| } | |||
|
|
|||
| // Check for a title on the form Backport <issueid> | |||
There was a problem hiding this comment.
Minor: "'of' the form ..."?
| assertEquals(List.of("integrationreviewer3"), message.reviewers()); | ||
| assertEquals(List.of(), message.contributors()); | ||
| assertEquals(List.of(), message.summaries()); | ||
| assertEquals(List.of(), message.additional()); |
There was a problem hiding this comment.
It might be good to also check that the commit message does not contain "Backport of", or is this covered by checking that message.additional() is empty?
There was a problem hiding this comment.
Good point. I just removed the assert for the existence of the original hash without thinking about inverting that assert.
|
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 new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout refactor-pr
git fetch https://git.openjdk.java.net/skara master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
@erikj79 This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be: 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 no new commits pushed to the
|
…A-1076-backport-issue
|
I just thought of one more thing you might need to handle. In the JBS issue, you mentioned two things that the "backport" label is used for:
For the case of no public SHA hash, Skara should not allow a Committer to declare it as clean. There isn't any way for anyone -- including the contributor -- to know whether or not it is clean. For the case being covered by this fix, there isn't a public patch to look at in the first place. |
|
/integrate |
This patch adds a new way of declaring a pull requests to be a backport for situations where the original hash of the original change is not known or available. Technically such a PR should already work without the backport label, but it will display a warning about the issue not being open. By being able to declare a backport, that warning will be eliminated, which should make the user experience smoother and hopefully help avoid mistakes.
To use the new feature, you create a PR with a title "Backport " instead of "Backport ". Once this goes live, I will update the Skara wiki documentation.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1186/head:pull/1186$ git checkout pull/1186Update a local copy of the PR:
$ git checkout pull/1186$ git pull https://git.openjdk.java.net/skara pull/1186/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1186View PR using the GUI difftool:
$ git pr show -t 1186Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1186.diff