Update landoscript merge_day.py to accomodate Thunderbird#1337
Open
dandarnell wants to merge 2 commits intomozilla-releng:masterfrom
Open
Update landoscript merge_day.py to accomodate Thunderbird#1337dandarnell wants to merge 2 commits intomozilla-releng:masterfrom
dandarnell wants to merge 2 commits intomozilla-releng:masterfrom
Conversation
bhearsum
requested changes
Feb 5, 2026
Contributor
bhearsum
left a comment
bhearsum
left a comment
There was a problem hiding this comment.
Let's make this cleaner and more explicit by making clobber file operations configurable at the payload level rather than hardcoding this magic string in this action. I expect we could add something like update_clobber_file to MergeInfo that defaults to true (to preserve existing behaviour) and override it in your task configuration.
If you need any additional pointers here just let me know.
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
2 participants
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.
Thunderbird does not have a CLOBBER file, so this PR bypasses that requirement for the merge_day action when run on Thunderbird repos.