264
return nil, serviceerror.NewNotFoundf("targeted secondary version %v not found", secondaryBuildID)
265
}
267
>
// Nothing to be done
268
>
return data, nil
269
>
}
270
// Merge the sets together, preserving the primary set's default by making it have the most recent timestamp.
272
>
primaryBuildId := primarySet.BuildIds[len(primarySet.BuildIds)-1]
273
>
primaryBuildId.BecameDefaultTimestamp = timestamp
274
>
justPrimaryData := &persistencespb.VersioningData{
275
>
VersionSets: []*persistencespb.CompatibleVersionSet{primarySet},
276
>
}
277
>
secondarySet := data.VersionSets[secondarySetIdx]
278
>
secondarySet.SetIds = mergeSetIDs(primarySet.SetIds, secondarySet.SetIds)
279
>
data = MergeVersioningData(justPrimaryData, data)
280
}
281