From d1020e4ec1ca400f5cee101fab7ba8b1c8264397 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Sat, 28 Jun 2025 23:38:33 +0930 Subject: [PATCH 1/2] When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction Setting diffCompare previously had the unintended result of a '..' prefix being added to the git diff command which would result in the diff being performed in the reverse direction than intended, causing additions to be treated as deletions for example. --- cls/SourceControl/Git/Utils.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 775aff1a..b4786065 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -1912,7 +1912,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O // Verbose output should not be required as pull already outputs a summary set syncIrisWithDiffVerbose = 0 // The current revision, prior to the pull, will be compared against - set diffCompare = ..GetCurrentRevision() + set diffBase = ..GetCurrentRevision() } elseif (command = "merge") || (command = "rebase") { set syncIrisWithCommand = 1 if $data(args) && $data(args(args),diffCompare) { From e047de364c3af69d01afcc2c2fea8feede433600 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Thu, 3 Jul 2025 08:51:28 +0930 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c36176..62282222 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed importing Lookup Tables that do not already exist (#791) +- Fixed syncing IRIS with files after pull to diff in the intended direction (#802) ## [2.12.1] - 2025-06-27