Skip to content

When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1020e4
When performing a pull set diffBase so that the diff to sync files wi…
raymond-rebbeck Jun 28, 2025
e047de3
Update CHANGELOG
raymond-rebbeck Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading