From 9b186393d0d16959395be418e7263da7df0e3e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Mon, 9 Dec 2024 13:27:54 +0100 Subject: [PATCH] Fix merging of metadata --- .../instance/changeSetsToMergeFSCommit.into.withBase.in..st | 4 ++-- .../GSMetadataMapper.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GitS-Core.package/GSMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st b/src/GitS-Core.package/GSMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st index 1df279162..67156f642 100644 --- a/src/GitS-Core.package/GSMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st +++ b/src/GitS-Core.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 \ No newline at end of file diff --git a/src/GitS-Core.package/GSMetadataMapper.class/methodProperties.json b/src/GitS-Core.package/GSMetadataMapper.class/methodProperties.json index 01e76bc10..281444288 100644 --- 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",