Merge pull request #589 from intersystems/issue-251

Fix CSP imports

Author: isc-tleavitt

CHANGELOG.md

@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed issue with saving multiple new no-folder mapping settings at the same time (#533)
 - Fixed sending OS error when git pull encounters error (#545)
 - Fixed suppressing editing of locked classes (#301)
+- Fixed importing CSP files (#251)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/Utils.cls

@@ -1412,8 +1412,8 @@ ClassMethod ImportCSPFile(InternalName As %String) As %Status
     if (cspFile=srcFile)||($$$isWINDOWS&&($ZCVT(cspFile,"l")=$ZCVT(srcFile,"l"))) {
         Quit $$$OK
     }
-
-    if '(##class(%File).Delete(cspFile) && ##class(%File).CopyFile(srcFile, cspFile)) {
+    // Delete original if exists, otherwise create new file
+    if '(##class(%File).CopyFile(srcFile, cspFile, 1)) {
         set sc = $$$ERROR($$$GeneralError, "Unable to import '"_srcFile_"'")
     }