• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Révision29380 (tree)
l'heure2022-04-09 01:48:04
Auteurstefankueng

Message de Log

Merged revision(s) r29378, r29379 from trunk:
* use the clipboard helper class to ensure the clipboard is closed after use
* fix check for modifications in WC

Change Summary

Modification

--- branches/1.14.x/src/Changelog.txt (revision 29379)
+++ branches/1.14.x/src/Changelog.txt (revision 29380)
@@ -1,4 +1,10 @@
1-Version 1.14.2
1+Version 1.14.3
2+- BUG: clipboard wasn't closed after pasting into
3+ the filter control in the log dialog. (Stefan)
4+- BUG: when merging via log dialog, a warning was falsely
5+ shown "The target has local modifications". (Stefan)
6+
7+Version 1.14.2
28 - BUG: when starting a log dialog from an existing
39 log dialog, the project properties were
410 not read anymore. (Stefan)
--- branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 29379)
+++ branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 29380)
@@ -5804,9 +5804,9 @@
58045804 bool bModified = false;
58055805 bool bSparse = false;
58065806
5807- if (GetWCRevisionStatus(CTSVNPath(path), true, minRev = 0, maxRev, bSwitched, bModified = false, bSparse))
5807+ if (GetWCRevisionStatus(CTSVNPath(path), true, minRev, maxRev, bSwitched, bModified, bSparse))
58085808 {
5809- if (bModified == false)
5809+ if (bModified)
58105810 {
58115811 CString sTask1;
58125812 sTask1.Format(IDS_MERGE_WCDIRTYASK_TASK1, static_cast<LPCWSTR>(path));
--- branches/1.14.x/src/Utils/MiscUI/FilterEdit.cpp (revision 29379)
+++ branches/1.14.x/src/Utils/MiscUI/FilterEdit.cpp (revision 29380)
@@ -20,6 +20,7 @@
2020 #include "FilterEdit.h"
2121 #include "LoadIconEx.h"
2222 #include "Theme.h"
23+#include "ClipboardHelper.h"
2324
2425 const UINT CFilterEdit::WM_FILTEREDIT_INFOCLICKED = ::RegisterWindowMessage(L"TSVNWM_FILTEREDIT_INFOCLICKED");
2526 const UINT CFilterEdit::WM_FILTEREDIT_CANCELCLICKED = ::RegisterWindowMessage(L"TSVNWM_FILTEREDIT_CANCELCLICKED");
@@ -456,7 +457,8 @@
456457
457458 LRESULT CFilterEdit::OnPaste(WPARAM, LPARAM)
458459 {
459- if (OpenClipboard())
460+ CClipboardHelper clipBoard;
461+ if (clipBoard.Open(m_hWnd))
460462 {
461463 CString toInsert;
462464 HGLOBAL hglb = GetClipboardData(CF_TEXT);
Afficher sur ancien navigateur de dépôt.