johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/{cmd,docs,internal,website}: make dolt backend explicitly single process

Browse Source
This commit is contained in:
Test
2026-01-20 16:51:14 -08:00
parent 869ee19f66
commit 7ed6849d19
16 changed files with 396 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/bd/sync.go
View File

@@ -185,7 +185,7 @@ The --full flag provides the legacy full sync behavior for backwards compatibili
fmt.Println("→ [DRY RUN] Would import from JSONL")
} else {
fmt.Println("→ Importing from JSONL...")
if err := importFromJSONLInline(ctx, jsonlPath, renameOnImport, noGitHistory); err != nil {
if err := importFromJSONLInline(ctx, jsonlPath, renameOnImport, noGitHistory, false); err != nil {
FatalError("importing: %v", err)
}
fmt.Println("✓ Import complete")
@@ -1066,7 +1066,7 @@ func resolveSyncConflicts(ctx context.Context, jsonlPath string, strategy config
}
// Import to database
if err := importFromJSONLInline(ctx, jsonlPath, false, false); err != nil {
if err := importFromJSONLInline(ctx, jsonlPath, false, false, false); err != nil {
return fmt.Errorf("importing merged state: %w", err)
}
@@ -1198,7 +1198,7 @@ func resolveSyncConflictsManually(ctx context.Context, jsonlPath, beadsDir strin
}
// Import to database
if err := importFromJSONLInline(ctx, jsonlPath, false, false); err != nil {
if err := importFromJSONLInline(ctx, jsonlPath, false, false, false); err != nil {
return fmt.Errorf("importing merged state: %w", err)
}