Portrait reservation fix?

2026-05-12 17:36:19 +02:00
parent 838d632a28
commit 53cb1e6996
3 changed files with 235 additions and 2 deletions
@@ -90,6 +90,10 @@ func mergeExpansionData(collected []nativeCollectedDataset) ([]nativeCollectedDa
 				return nil, fmt.Errorf("expansion targets unknown dataset %q", targetDatasetName)
 			}
 			targetDS := collected[targetIndex]
+			originalLockData, _ := loadLockfile(targetDS.Dataset.LockPath)
+			if originalLockData == nil {
+				originalLockData = map[string]int{}
+			}
 			lockModified := false
 			usedIDs := map[int]struct{}{}
 			usedKeys := map[string]struct{}{}
@@ -135,6 +139,12 @@ func mergeExpansionData(collected []nativeCollectedDataset) ([]nativeCollectedDa
 					if existingID, exists := targetDS.LockData[key]; exists {
 						rowID = existingID
 						hasID = true
+					} else if existingID, exists := originalLockData[key]; exists {
+						rowID = existingID
+						hasID = true
+						targetDS.LockData[key] = existingID
+						lockModified = true
+						targetDS.LockModified = true
 					}
 					if _, seen := usedKeys[key]; seen {
 						continue