Repository navigation
Conversation
added 2 commits
November 22, 2026 19:33
…ines do not conflict Two branches that each append a line to the option matrix's skip list conflicted at the file's end (apache#1619 and apache#1617 on 22 Nov 2026). sql/varka/.gitattributes now gives the file git's built-in union driver. The generated-file driver's self-test accepts a rule that marks no file generated, as long as it names a tracked file. AGENTS.md says what union keeps. Generated-by: Claude Code (Claude Opus 5.5)
…t twice The self-test's tracked-file fallback now takes a merge=union rule only, so a misspelt attribute on a generated file still fails it. The skip list's lint flags a second line for the same configuration, suite and test, the form a union merge leaves when one side edits a line beside the other's append. AGENTS.md says the rule acts on local merges only. Generated-by: Claude Code (Claude Opus 5.5)
Author
|
Option matrix run: https://github.com/MaxGekk/spark/actions/runs/45061408127 (jobs: 1 queued) |
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.
What changes were proposed in this pull request?
sql/varka/matrix/skips.tsvis the option matrix's skip list. People write it by hand and mostly add lines at its end.sql/varka/.gitattributesnow gives it git's built-inunionmerge driver:/matrix/skips.tsv merge=union. In a conflicting hunk, union keeps the lines of both sides instead of writing conflict markers. It is built into git, so no clone needs--install-hook.dev/varka_generated_merge.py, does not take this file. It writes a file it cannot merge from one side and lists it for regeneration, and nothing regenerates the skip list.varka_msg_check.pyalso counts the file as hand-written.sql/varka/.gitattributesto name a generated file. Amerge=unionrule now only has to name a tracked file. Every other rule still has to name a generated file, so a misspelt attribute still fails.dev/varka_lint.pyflags a second skip line for the same configuration, suite and test. This is what union leaves when one side edits a line next to the other side's added line.sql/varka/AGENTS.mdsays how the file merges and what to check after a merge.Why are the changes needed?
On 22 Nov 2026, #1619 and #1617 each added lines at the end of
skips.tsv. The second merge conflicted there, and #1619 had to be merged again by hand. Two added skip lines are independent, so the merge should keep both.Does this PR introduce any user-facing change?
No. Only the repository's merge behaviour and checks change.
How was this patch tested?
On the laptop, one sbt at a time, on head
97b17502cbc(based on masterb4cbee926d1).skips.tsv. They merged with no conflict and kept both lines. The same merge on master, without the rule, conflicted.dev/varka_lint.py sql/varka/matrix/skips.tsv, which reads every line.dev/varka_generated_merge.py --self-test(83 cases) anddev/varka_lint.py --selftest(71 cases, one new) passed. The self-test still fails on a misspeltmerge=varka-generatd.python3 dev/varka_push_check.pypassed.~/varka-ops/pre-pr.sh --no-mergepassed: the full regeneration changed nothing, then the extra gate and the push check passed. The branch changes no suite, so no arm sweep ran.merge=union. Not run: CI Build and the option matrix.Review
/code-review highonvarka-skips-union-mergefound one important problem and four nits. All five are fixed in the second commit:merge=unionrule.AGENTS.mdnow says the rule acts on local merges, and only on a branch that has the rule.AGENTS.mddescribes what union keeps more exactly.The fixes were not reviewed again. The size is 38 counted lines.
Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Claude Opus 5.5)