Fix tests after --resolve-collisions removal
Remove obsolete test file and update remaining tests to not use the removed --resolve-collisions flag. Hash-based IDs make collision resolution unnecessary. Changes: - Delete internal/rpc/server_autoimport_test.go (obsolete) - Remove --resolve-collisions from beads_nway_test.go - Remove --resolve-collisions from beads_twoclone_test.go - Remove --resolve-collisions from cmd/bd/sync.go All tests now pass.
This commit is contained in:
@@ -483,12 +483,12 @@ func importFromJSONL(ctx context.Context, jsonlPath string, renameOnImport bool)
|
||||
}
|
||||
|
||||
// Build args for import command
|
||||
args := []string{"import", "-i", jsonlPath, "--resolve-collisions"}
|
||||
args := []string{"import", "-i", jsonlPath}
|
||||
if renameOnImport {
|
||||
args = append(args, "--rename-on-import")
|
||||
}
|
||||
|
||||
// Run import command with --resolve-collisions to automatically handle conflicts
|
||||
// Run import command
|
||||
cmd := exec.CommandContext(ctx, exe, args...) // #nosec G204 - bd import command from trusted binary
|
||||
output, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user