Repository navigation
tools: fix shared file merging and bazel-registry SHA sync in updater - #1646
Merged
fei-deng merged 1 commit intoOct 27, 2026
Merged
Conversation
- Pre-align .bazelrc bazel-registry SHA with base_content before running git merge-file and sync to target_content afterward. - Preserve trailing newlines on temp files passed to git merge-file. - Collect all conflicted_files across SHARED_FILES before raising. Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com>
Contributor
|
LGTM |
fei-deng
approved these changes
Oct 27, 2026
This file contains hidden or 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
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.
Pre-align
.bazelrcbazel-registrySHA and preserve trailing newlines inPATCH_SHARED_FILES:envoyproxy/bazel-registrycommit hash in Nighthawk's.bazelrcwithbase_content(current_envoy_commit) before runninggit merge-fileso prior manual/intermediate registry bumps do not trigger spurious 3-way merge conflicts on the registry line."\n"after_run_command(["git", "show", ...])(since_run_commandstrips trailing whitespace) sogit merge-filedoes not strip trailing newlines at EOF.conflicted_filesacrossSHARED_FILESbefore raisingRuntimeErrorinstead of aborting on the first conflicted file.