Skip to content
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

Jump to bottom

ロックを取得する際に読み取り専用だった場合も閉じずにそのままロックの取得をするように変更しました。 #44

Merged
merged 1 commit into from
Sep 20, 2017
Merged

ロックを取得する際に読み取り専用だった場合も閉じずにそのままロックの取得をするように変更しました。 #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 4 additions & 15 deletions Source/src/Class/TortoiseSVN.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,24 +268,13 @@ Private Sub IVersion_Locked()
End If
End With

If Not WB.Saved Then
If MsgBox("ブックが変更されています。破棄しますか？", vbOKCancel + vbQuestion, C_TITLE) <> vbOK Then
Exit Sub
End If
CreateObject("Scripting.FileSystemObject").GetFile(WB.FullName).Attributes = 0
If WB.ReadOnly Then
WB.ChangeFileAccess xlReadWrite
Set WB = ActiveWorkbook 'ローカルの場合情報が失われるため再セット
End If

On Error Resume Next

Application.DisplayAlerts = False
Application.ScreenUpdating = False

strCommand = CMD_LOCK & GetPath(WB.FullName) & OPT_END0
WB.Close False
Run strCommand

Workbooks.Open strBook
Application.DisplayAlerts = True
Application.ScreenUpdating = True

Exit Sub
e:
Expand Down