[backport 5.2] gitserver: disk-info: make test hit two separate gitserver addresses#57346
Conversation
|
@sourcegraph/release-guild please stamp, thanks! |
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff 0ad56cc...d637abe.
|
keegancsmith
left a comment
There was a problem hiding this comment.
@ggilmore it isn't clear what this is fixing, from the other description it looks like it is part of fixing a test? But I assume there is something changelog worthy here for 5.2.1?
Does Erik's race condition fix also need to go in? Is that why you needed to do a manual backport?
Will merge now, but please follow-up with the above.
f0bf61e to
d637abe
Compare
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.2 5.2
# Navigate to the new working tree
cd .worktrees/backport-5.2
# Create a new branch
git switch --create backport-57346-to-5.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 461cf0ee60fbd521343acfefb516297a5dcdca19
# Push it to GitHub
git push --set-upstream origin backport-57346-to-5.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.2If you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-57346-to-5.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.2
|
Yes, this is dependent on Erik's race condition fix. This was already backported here: https://github.com/sourcegraph/sourcegraph/pull/57415 However, the need to manually backport was due to a conflict in one of the bazel BUILD files (changing imports), it wasn't due to Erik's change.
|
Manual backport of #57318 since there were merge conflicts.
Test plan
CI