RFR: 1568: Dependency PR Resolution Detection Does Not Check Means of Resolution

Erik Joelsson erikj at openjdk.org
Tue Sep 6 17:27:08 UTC 2022


On Thu, 1 Sep 2022 05:29:35 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> Currently, the closed but not integrated PR causes the dependent PRs to be retargeted. It is not right. This patch fixes it and changes the test case.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

I agree that all of those are possible situations, and I also agree that the Skara bot can't reasonably figure out which one is correct. Because of that, I think the best we can reasonably do is post a comment explaining what happened and tell the user what to do. I also think we have to still delete the branch and retarget the dependent pull request. 

Also please note that "dependent" should refer to the PR that depends on another PR. Example PR A has a PR B depending on it. That means the target of PR B is the branch pr/A. In this situation, PR B is the dependent of PR A. The current message has this mixed up. If we need to refer to PR A, we could perhaps use the word "parent".

Here is my take on a message:

The parent pull request that this pull request depend on has been closed without being integrated. This has caused the pull request branch `pr/XX` to be deleted and the target branch of this pull request to be updated, which means that changes from the parent pull request will start to show up in this pull request. If closing the parent pull request was done in error, it will need to be re-opened and this pull request will need to be retargeted again manually.

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

PR: https://git.openjdk.org/skara/pull/1365


More information about the skara-dev mailing list