Skip to content

[VARKA] Merge skips.tsv by union, so two appended skip lines do not conflict - #1633

Open
MaxGekk wants to merge 2 commits into
vecbricks:masterfrom
MaxGekk:varka-skips-union-merge
Open

MaxGekk wants to merge 2 commits into
vecbricks:masterfrom
MaxGekk:varka-skips-union-merge

Conversation

@MaxGekk

@MaxGekk MaxGekk commented Nov 22, 2026

Copy link
Copy Markdown

What changes were proposed in this pull request?

sql/varka/matrix/skips.tsv is the option matrix's skip list. People write it by hand and mostly add lines at its end. sql/varka/.gitattributes now gives it git's built-in union merge 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.

  • The generated-file driver, 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.py also counts the file as hand-written.
  • That driver's self-test wanted every rule in sql/varka/.gitattributes to name a generated file. A merge=union rule 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.py flags 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.md says 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 master b4cbee926d1).

  • In a scratch clone, two branches each added a different five-field line to the real skips.tsv. They merged with no conflict and kept both lines. The same merge on master, without the rule, conflicted.
  • In scratch repositories: the same line added by both sides at the same place appears once. A line removed in the middle of the file stays removed.
  • Union keeps a removed or edited line when it sits next to the other side's added line. The same line added at two different places is kept twice. The new lint check catches an edited line kept twice, and the existing check catches an exact repeat. A line brought back for a renamed test is caught only by dev/varka_lint.py sql/varka/matrix/skips.tsv, which reads every line.
  • dev/varka_generated_merge.py --self-test (83 cases) and dev/varka_lint.py --selftest (71 cases, one new) passed. The self-test still fails on a misspelt merge=varka-generatd.
  • python3 dev/varka_push_check.py passed.
  • ~/varka-ops/pre-pr.sh --no-merge passed: the full regeneration changed nothing, then the extra gate and the push check passed. The branch changes no suite, so no arm sweep ran.
  • The first pre-pr run failed in the regeneration. The width audit's 128-bit probe went over its 600 s limit while the laptop's load average was 23 to 30. It passed on the rerun.
  • Not checked: whether GitHub's own merge check uses merge=union. Not run: CI Build and the option matrix.

Review

/code-review high on varka-skips-union-merge found one important problem and four nits. All five are fixed in the second commit:

  • The self-test's first fallback let a misspelt attribute pass. Now it applies only to a merge=union rule.
  • AGENTS.md now says the rule acts on local merges, and only on a branch that has the rule.
  • The lint check now flags a test named twice, and AGENTS.md describes 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)

t 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)
@MaxGekk

MaxGekk commented Nov 22, 2026 •

Copy link
Copy Markdown
Author

Option matrix run: https://github.com/MaxGekk/spark/actions/runs/45061408127 (jobs: 1 queued)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant