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

fix: resolve JSONL conflict

Browse Source 
Amp-Thread-ID: https://ampcode.com/threads/T-22f7d7c5-6f7b-4783-beda-8494360d887a
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
2025-11-05 00:55:52 -08:00
parent 6da54f49fa 0abd21f7a6
commit b5e451694a
2 changed files with 233 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

421
.beads/beads.jsonl
View File

File diff suppressed because one or more lines are too long

26
internal/importer/importer.go
View File

@@ -289,9 +289,29 @@ func handleRename(ctx context.Context, s *sqlite.SQLiteStorage, existing *types.
// The rename is already complete in the database // The rename is already complete in the database
return deletedID, nil return deletedID, nil
} }
// REMOVED (bd-8e05): Sequential ID collision handling during rename // With hash IDs, same content should produce same ID. If we find same content
// With hash-based IDs, rename collisions should not occur // with different IDs, treat it as an update to the existing ID (not a rename).
return "", fmt.Errorf("rename collision handling removed - should not occur with hash IDs") // This handles edge cases like test data, legacy data, or data corruption.
// Keep the existing ID and update fields if incoming has newer timestamp.
if incoming.UpdatedAt.After(existing.UpdatedAt) {
// Update existing issue with incoming's fields
updates := map[string]interface{}{
"title": incoming.Title,
"description": incoming.Description,
"design": incoming.Design,
"acceptance_criteria": incoming.AcceptanceCriteria,
"notes": incoming.Notes,
"external_ref": incoming.ExternalRef,
"status": incoming.Status,
"priority": incoming.Priority,
"issue_type": incoming.IssueType,
"assignee": incoming.Assignee,
}
if err := s.UpdateIssue(ctx, existing.ID, updates, "importer"); err != nil {
return "", fmt.Errorf("failed to update issue %s: %w", existing.ID, err)
}
}
return "", nil
/* OLD CODE REMOVED (bd-8e05) /* OLD CODE REMOVED (bd-8e05)
// Different content - this is a collision during rename // Different content - this is a collision during rename