Skip to content

Commit 13714cb

Browse files
committed
Bug fixes and replace SQL locked property name
1 parent c7cc4df commit 13714cb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cls/SourceControl/Git/DiscardState.cls

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Property Timestamp As %TimeStamp [ Required ];
1616
Property ExternalFile As %Boolean [ Required ];
1717

1818
// Boolean tracking whether or not file was deleted as part of change
19-
Property Delete As %Boolean;
19+
Property Deleted As %Boolean;
2020

2121
Index BranchMap On Branch [ Type = bitmap ];
2222

@@ -28,9 +28,8 @@ Method RestoreToFileTree()
2828
do ##class(%File).CreateDirectoryChain(dir)
2929
}
3030

31-
if (..Delete) {
31+
if (..Deleted) {
3232
do ##class(%File).Delete(..FullExternalName)
33-
do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
3433
} else {
3534

3635
// Recreate File
@@ -73,7 +72,8 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
7372
do discardState.Contents.CopyFrom(fileStream)
7473
do fileStream.%Close()
7574
} else {
76-
set discardState.Delete = 1
75+
set discardState.Deleted = 1
76+
do discardState.Contents.Write("Deleted File")
7777
}
7878

7979
// Save extra information

0 commit comments

Comments
 (0)