Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1080: /backport command reports conflict even though there isn't any #1188

Closed
wants to merge 2 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jun 15, 2021

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.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1080: /backport command reports conflict even though there isn't any

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1188/head:pull/1188
$ git checkout pull/1188

Update a local copy of the PR:
$ git checkout pull/1188
$ git pull https://git.openjdk.java.net/skara pull/1188/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1188

View PR using the GUI difftool:
$ git pr show -t 1188

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1188.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 15, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into pr/1187 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1080 1080: /backport command reports conflict even though there isn't any Jun 15, 2021
@openjdk openjdk bot added the rfr label Jun 15, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 15, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1187 to master Jun 15, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Jun 15, 2021

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"
git push

@openjdk
Copy link

@openjdk openjdk bot commented Jun 15, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

1080: /backport command reports conflict even though there isn't any

Reviewed-by: kcr

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 1 new commit pushed to the master branch:

  • ada4e37: Code cleanup before starting SKARA-1080

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jun 15, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jun 15, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 15, 2021

Going to push as commit 5cf9d46.
Since your change was applied there has been 1 commit pushed to the master branch:

  • ada4e37: Code cleanup before starting SKARA-1080

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 15, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 15, 2021

@erikj79 Pushed as commit 5cf9d46.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants