From d548ca57a5e1d1fc4118a20a6eba78b8dcc073e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Wed, 10 Jul 2024 17:10:23 +0200 Subject: [PATCH] Handle nil merge result in SquotPlaintextMapper --- .../instance/mergeVersion.into.withBase..st | 5 +++-- .../SquotPlaintextMapper.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st b/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st index de7be663d..a06f0a65d 100644 --- a/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st +++ b/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st @@ -2,13 +2,14 @@ merging mergeVersion: right into: left withBase: base | merged | merged := self toPlaintext: - (SquotMergeUtilities + ((SquotMergeUtilities stringOrNilMergeLeft: left right: right base: base ifConflict: [^ SquotPlaintextConflictChangeSet withMapper: self - conflict: (SquotMergeConflict left: left right: right base: base)]). + conflict: (SquotMergeConflict left: left right: right base: base)]) + ifNil: [^ nil]). ^ (merged squotEqual: left) ifTrue: [SquotEmptyChangeSet withMapper: self] ifFalse: [SquotPlaintextNormalChangeSet withMapper: self from: left to: merged] \ No newline at end of file diff --git a/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json b/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json index 09ca0b256..b294bc31c 100644 --- a/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json +++ b/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json @@ -14,7 +14,7 @@ "importPriority" : "mad 4/22/2024 16:43", "isSourceAt:timeStampOf:" : "mad 11/7/2023 14:42", "isValidVersion:" : "mad 11/6/2023 13:22", - "mergeVersion:into:withBase:" : "mad 12/7/2023 14:14", + "mergeVersion:into:withBase:" : "mad 7/10/2024 17:08", "pathFor:" : "mad 11/7/2023 14:42", "printOn:" : "mad 11/7/2023 12:47", "printWithoutPathOn:" : "mad 11/7/2023 12:47",