beads/internal
Steve Yegge 508d359211 fix(automerge): tell a no-op merge write from a vanished row (wy-o8swn)
The conflict resolvers read res.RowsAffected()==0 after their UPDATE as
proof the row had been deleted concurrently, and aborted the whole merge
saying so. But doltutil/dsn.go sets parseTime and multiStatements and NOT
clientFoundRows, so RowsAffected is rows CHANGED, not rows MATCHED: a
merged write the backend normalizes to the bytes already stored reports
zero exactly as a vanished row does, and a correct merge died on a
message about a deletion that never happened.

Ask instead. conflictTargetStillPresent is the matched-rows check both
sites lacked, and it covers the operator path too — resolveOneConflictRow
(bd conflicts resolve --theirs <id>) carried the identical conflation,
where a misleading abort is worse because the operator named the row. It
confirms only that the key still resolves to a row, which is the honest
postcondition: comparing the written values would reintroduce the very
normalization sensitivity this exists to absorb. A check that cannot be
run refuses rather than clearing a conflict it could not confirm.

Second half: the bulk load never rejected duplicate conflict rows sharing
one our-side key the way loadConflictRow does for the single-row path. If
dolt ever emits two, the first DELETE ... WHERE our_id = ? clears both
and the next iteration aborts on "no conflict row deleted" — again a
message about the wrong thing, after a row was resolved without ever
being merged. duplicateConflictKey now catches that shape, and the
pre-screens DECLINE on it rather than erroring: an error out of
issuesConflictsAreFieldMergeable is swallowed by SettleMerge's abort path
and would turn a reportable conflict into an opaque pull failure, where a
decline still builds the MergeConflictsError that names the tables an
operator has to look at. Rows whose our side is NULL (delete/modify) are
skipped — they are never the target of a keyed delete.

Neither shape is known to fire today; both were left unfixed at the tail
of the wy-jpd3.6 diff (F7) rather than patched in a hurry.
2026-07-25 04:50:05 -07:00
..
ado fix(ado): preserve unmanaged links on push instead of clobbering them (#4523) 2026-07-05 10:53:05 -07:00
atomicfile /internal/atomicfile/atomicfile.go: use io.Copy 2026-05-01 17:03:30 -07:00
audit fix(audit): make JSONL sidecar opt-in (#4688) 2026-07-11 00:09:17 -07:00
beads feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
compact fix(compact): archive content before destructive compaction; make restore work (#4464) 2026-06-20 14:12:07 -07:00
config fix(leases): keep node_id off the committed config; tighten the replica guard (wy-jpd3.7) 2026-07-25 02:32:31 -07:00
configfile refactor(storage)!: remove the SQLite backend and dialect 2026-07-18 02:43:56 +00:00
creds fix(backends): address red-team review findings before merge 2026-07-10 18:58:00 +00:00
debug feat(verbosity): wire --quiet into create/close/update (bd-au0.10) (#4058) 2026-07-06 22:35:42 -07:00
doltremote fix(doltremote): fold host case, strip creds, recognize user-less SCP in CanonicalForComparison (#4576) 2026-07-07 12:59:18 -07:00
doltserver fix(windows): detect exited processes in liveness helpers (#4980) (#4981) 2026-07-23 18:24:49 -07:00
formula feat(formula): make primitives discoverable to coding agents (GH#3621) (#3781) 2026-07-06 22:26:41 -07:00
git test(git): restore cwd before temp cleanup (#4935) (#4936) 2026-07-23 18:40:44 -07:00
github fix(github) bd github sync (GitHub issues integration) (#3929) 2026-05-15 08:47:39 -07:00
gitlab feat(gitlab): sync issue dependency links on push (#4294) 2026-07-08 08:00:41 -07:00
hooks test: port Windows hardening fixes (#4600) 2026-07-07 12:59:50 -07:00
idgen fix(idgen): correct test vectors in hash_test.go 2025-12-19 18:13:56 -08:00
jira feat(storage): keyset reads — comments page, issue-list cursor, IsBlocked filter (#4922) 2026-07-21 22:29:09 -07:00
linear fix(windows): detect exited processes in liveness helpers (#4980) (#4981) 2026-07-23 18:24:49 -07:00
lockfile Triage and clean up an unreviewed automated commit stream on main (#4418) 2026-06-15 20:24:57 -07:00
metrics feat: honor DO_NOT_TRACK as a metrics opt-out (#4938) 2026-07-21 08:35:20 -07:00
molecules feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
notion fix(notion): drop in_trash from data-source query body (Notion 400) (#4543) 2026-07-05 10:53:01 -07:00
query fix(query): make slash and mixed-case metadata keys queryable (#4896) 2026-07-24 17:52:22 -07:00
recipes docs: fix integration-page fact errors; restore three lost source edits 2026-07-12 10:37:18 -07:00
remotecache fix: pass remote auth user during clone (#4484) 2026-07-05 11:28:24 -07:00
routing fix: anchor jj-secondary role resolution at repoPath, not cwd 2026-06-04 15:00:30 -07:00
storage fix(automerge): tell a no-op merge write from a vanished row (wy-o8swn) 2026-07-25 04:50:05 -07:00
telemetry feat(storage): keyset reads — comments page, issue-list cursor, IsBlocked filter (#4922) 2026-07-21 22:29:09 -07:00
templates fix(cli): printed doc paths point at the new docs locations 2026-07-12 10:37:17 -07:00
testutil /{.github,docs,engdocs,go,internal,scripts}: bump dolt 2026-07-15 13:14:34 -07:00
timeparsing chore: unexport 14 dead symbols across 8 packages 2026-02-07 09:24:22 -08:00
tracker feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
types feat(leases): replica-aware leases — record the granting node, refuse cross-replica reclaim (wy-jpd3.7) 2026-07-24 23:53:34 -07:00
ui test(cli): cover --no-color flag handling and ui.DisableColors 2026-07-07 23:32:22 -04:00
uimd fix(cli): render markdown with terminal capability gates (#3881) 2026-06-25 13:55:28 -07:00
utils feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
validation feat(lint): accept Acceptance Criteria heading for epics (#3834) 2026-07-07 23:00:30 -04:00