merge-queue: embarking main (ec99bcd) and #292 together#312
Closed
mergify[bot] wants to merge 2 commits intomainfrom
Closed
merge-queue: embarking main (ec99bcd) and #292 together#312mergify[bot] wants to merge 2 commits intomainfrom
mergify[bot] wants to merge 2 commits intomainfrom
Conversation
The definition of defaultEmptyProg is a hack, hardcoding an ID of 0 for 'main' and 2 for 'other', regardless of whether they are fresh or not. This leads to two different defs having ID 0 in defaultPrimsProg as normally used in progActionTest, and it turns out that 'main' is overwritten with a primitive definition. Thus one cannot do any edits to ID 0 in tests. Note that whilst we have worked around this symptom, the implementation of defaultEmptyProg is still wrong: these IDs will clash with some node IDs in the current usage.
Author
|
The pull request #292 is mergeable |
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
1 participant
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.
🎉 This combination of pull requests has been checked successfully 🎉
Branch main (ec99bcd) and #292 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #292.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:base=maincheck-success="buildkite/primer/pr/required"More informations about Mergify merge queue can be found in the documentation.
Mergify commands
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the queue rulesAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com