Consider branch remote when guessing MR #838
Conversation
When trying to find the merge request that corresponds to the local branch, we cannot assume that the branch was pushed to the upstream repository instead of a personal fork. This reverts commit 472b2e6.
When trying to guess the merge request that corresponds to a local branch, we search for MRs that match the (upstream) branch name. But as branch names only have to be unique within a project, it is possible that there are multiple merge requests from different forks that use the same source branch name. Luckily we do know which is the correct source project: It's the one that corresponds to the remote that the local branch was pushed to.
The changes from commit 9fa3698 changed the expected behavior on Test_mrBrowseCurrent test code, which was waiting for an MR created from the upstream repository instead of the fork that the 'mrtest' branch tracks. This patch fix it by checking-out to the 'mrtest2' branch and waiting for MR 3, which was created from fork's 'mrtest2' branch. Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
|
This PR changes the expected behavior by the Test_mrBrowseCurrent test code: the To fix it I pushed to your branch the necessary changes in |
Codecov Report
@@ Coverage Diff @@
## master #838 +/- ##
==========================================
+ Coverage 55.94% 55.99% +0.04%
==========================================
Files 77 77
Lines 5750 5751 +1
==========================================
+ Hits 3217 3220 +3
+ Misses 2243 2242 -1
+ Partials 290 289 -1
Continue to review full report at Codecov.
|
|
I'll also create a "hotfix" with your change and release it as 0.25.1. |
When trying to guess the merge request that corresponds to a
local branch, we search for MRs that match the (upstream) branch
name.
But as branch names only have to be unique within a project, it
is possible that there are multiple merge requests from different
forks that use the same source branch name.
Luckily we do know which is the correct source project: It's the
one that corresponds to the remote that the local branch was pushed
to.