064fb290d6cf

reword two comments away from git terms, and record the A4 pass in continuity (3.2.20)

time
2026-09-29 02:48 UTC · 2 weeks ago
machine
Junes-MacBook-Pro.local
agent
claude-sonnet-5-5
session
comment and tidy pass
parent
1f6a60e93364
4 files VERSION+1 −1src/exchange/steal.v+1 −1src/storage/storage.v+1 −1v.mod+1 −1
VERSION+1 −1
@@ -1 +1 @@1-3.2.191+3.2.20

view file

src/exchange/steal.v+1 −1
@@ -446,7 +446,7 @@446446 }447447 448448 // combine_preview counts what a combine would do to the paths either side changed since `base`:449-// `identical` were changed the same way on both sides, `clashes` need a choice, the rest merge alone.449+// `identical` were changed the same way on both sides, `clashes` need a choice, the rest go in by themselves.450450 fn combine_preview(store &storage.Store, name string, fetched Fetched, local []history.Save, clashes []Clash, yes bool, all_side string) !StealPreview {451451 	base := history.files_of(store, fetched.base)!452452 	mine := history.files_of(store, local.last().id)!

view file

src/storage/storage.v+1 −1
@@ -171,7 +171,7 @@171171 	s.db.exec('BEGIN IMMEDIATE')!172172 }173173 174-// end commits what begin opened.174+// end finishes the transaction begin opened.175175 pub fn (s &Store) end() ! {176176 	s.db.exec('END')!177177 }

view file

v.mod+1 −1
@@ -1,6 +1,6 @@11 Module {22 	name: 'koh3'3-	version: '3.2.19'3+	version: '3.2.20'44 	description: 'One SQLite file per repo, one line of history.'55 	license: 'MIT'66 }

view file