Fix merging of metadata

hpi-swa · Dec 9, 2024 · 9b18639 · 9b18639
1 parent 1f2d6ff
commit 9b18639
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...re.package/GSMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st b/...re.package/GSMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st
@@ -29,8 +29,8 @@ changeSetsToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSComm
 		removing: potentiallyRemovedMappers
 		changeSets: mapperChangeSets.
 	metadataChangeSet := self
-		changeSetToMergeMetadata: metadataForCommits second
-		into: metadataForCommits first
+		changeSetToMergeMetadata: metadataForCommits first
+		into: metadataForCommits second
 		withBase: metadataForCommits third
 		mappersChangeSet: mappersChangeSet.
 	^ mapperChangeSets values copyWith: metadataChangeSet
diff --git a/src/GitS-Core.package/GSMetadataMapper.class/methodProperties.json b/src/GitS-Core.package/GSMetadataMapper.class/methodProperties.json
@@ -19,7 +19,7 @@
 		"changeSetsFromFSCommit:toImage:" : "mad 6/12/2024 13:59",
 		"changeSetsFromImage:toFSCommit:" : "mad 6/12/2024 14:00",
 		"changeSetsFromMetadata:toMetadata:old:common:new:in:" : "mad 10/7/2024 17:31",
-		"changeSetsToMergeFSCommit:into:withBase:in:" : "mad 10/7/2024 17:31",
+		"changeSetsToMergeFSCommit:into:withBase:in:" : "mad 12/9/2024 13:27",
 		"fixedLegacyReferencesIn:" : "mad 10/9/2024 18:02",
 		"hasAnyFile:" : "mad 10/9/2024 23:12",
 		"hexHashPath" : "mad 11/12/2024 14:52",