RFR: 1080: /backport command reports conflict even though there isn't any
"github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net
Tue Jun 15 13:41:45 UTC 2021
On Tue, 15 Jun 2021 00:31:03 GMT, Erik Joelsson <erikj at openjdk.org> wrote:
> This patch fixes a bug with the /backport commit command. It currently materializes the workspace where the cherry-picking is done from the wrong repository. It should be using the target repository, but instead it's using the "fork" (which is the repo from which we create the pull request if /backport is successful).
> In the tests, this wasn't handled at all. All the tests used the same hosted repository for the "fork" as the target. I introduced a separate "fork" repository in the tests where it would make a difference.
> I changed the backportDoesNotApply test so that it would fail without this fix. I also think I made it clearer why the backport shouldn't apply as well.
> Finally I added a new test which verifies a situation very similar to the original issue reported.
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 backport-cleanup
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"
More information about the skara-dev