Fixes #8429: rudder-dev merge --test can fail #157
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Commit modified |
peckpeck
force-pushed
the
bug_8429/rudder_dev_merge_test_can_fail
branch
from
1f5b6b1
to
b5f866c
Compare
peckpeck
force-pushed
the
bug_8429/rudder_dev_merge_test_can_fail
branch
from
b5f866c
to
5a6127a
Compare
|
Commit modified |
peckpeck
force-pushed
the
bug_8429/rudder_dev_merge_test_can_fail
branch
from
5a6127a
to
00e7c61
Compare
|
Commit modified |
|
This is a test |
| @@ -846,6 +848,8 @@ def insert_line(filename, regex, text): | |||
| # fetch a branch from a PR | |||
| def fetch_branch_from_pr(pr): | |||
| branch_name = pr.remote_branch() | |||
| # PR can be rebased, first destroy existing branch | |||
| shell("git branch -D " + branch_name + " 2>/dev/null || true", "Cleaning existing fetched branch") | |||
There was a problem hiding this comment.
It should not be branch_name that should be deleted but a branch created for the fetch (branch_name_remote ? )
|
Commit modified |
peckpeck
force-pushed
the
bug_8429/rudder_dev_merge_test_can_fail
branch
from
00e7c61
to
1fcf620
Compare
| @@ -846,7 +848,8 @@ def insert_line(filename, regex, text): | |||
| # fetch a branch from a PR | |||
| def fetch_branch_from_pr(pr): | |||
| branch_name = pr.remote_branch() | |||
| shell("git fetch --update-head-ok " + pr.repo() + " " + branch_name + ":" + branch_name, "Fetching branch from remote " + pr.repo()) | |||
| # PR can be rebased, first destroy existing branch | |||
There was a problem hiding this comment.
The commentis noit accurate, we don't destroy branch but force update on a dedicated branch
|
Commit modified |
peckpeck
force-pushed
the
bug_8429/rudder_dev_merge_test_can_fail
branch
from
1fcf620
to
16018fa
Compare
|
Can be merged :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/8429