• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28195 (tree)
Time2018-04-19 02:15:23
Authorstefankueng

Log Message

use the correct dialog titles and command button texts when handling different kinds of conflicts.

Change Summary

Incremental Difference

--- trunk/src/Changelog.txt (revision 28194)
+++ trunk/src/Changelog.txt (revision 28195)
@@ -1,4 +1,8 @@
1-Version 1.10.0
1+Version 1.10.1
2+- BUG: Wrong texts in conflict resolving
3+ dialogs. (Stefan)
4+
5+Version 1.10.0
26 See the release notes here:
37 http://tortoisesvn.net/tsvn_1.10_releasenotes.html
48
--- trunk/src/TortoiseProc/PropConflictEditorDlg.cpp (revision 28194)
+++ trunk/src/TortoiseProc/PropConflictEditorDlg.cpp (revision 28195)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2016-2017 - TortoiseSVN
3+// Copyright (C) 2016-2018 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -160,7 +160,7 @@
160160 {
161161 auto path = m_conflictInfo->GetPath().GetFileOrDirectoryName();
162162 CString sDialogTitle;
163- sDialogTitle.LoadString(IDS_PROC_EDIT_TREE_CONFLICTS);
163+ sDialogTitle.LoadString(IDS_PROC_EDIT_PROP_CONFLICTS);
164164 sDialogTitle = CCommonAppUtils::FormatWindowTitle(path, sDialogTitle);
165165
166166 if (!m_conflictInfo->GetPropResolutionOptions(m_options))
--- trunk/src/TortoiseProc/TextConflictEditorDlg.cpp (revision 28194)
+++ trunk/src/TortoiseProc/TextConflictEditorDlg.cpp (revision 28195)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2016-2017 - TortoiseSVN
3+// Copyright (C) 2016-2018 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -159,7 +159,7 @@
159159 {
160160 auto path = m_conflictInfo->GetPath().GetFileOrDirectoryName();
161161 CString sDialogTitle;
162- sDialogTitle.LoadString(IDS_PROC_EDIT_TREE_CONFLICTS);
162+ sDialogTitle.LoadString(IDS_PROC_EDIT_TEXT_CONFLICTS);
163163 sDialogTitle = CCommonAppUtils::FormatWindowTitle(path, sDialogTitle);
164164
165165 if (!m_conflictInfo->GetTextResolutionOptions(m_options))
@@ -185,7 +185,7 @@
185185 AddCommandButton(buttonID, optLabel + L"\n" + optDescription);
186186 }
187187
188- AddCommandButton(1000, CString(MAKEINTRESOURCE(IDS_EDITCONFLICT_PROP_EDITCMD)));
188+ AddCommandButton(1000, CString(MAKEINTRESOURCE(IDS_EDITCONFLICT_TEXT_EDITCMD)));
189189
190190 int button;
191191 TASKDIALOGCONFIG taskConfig = { 0 };
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Show on old repository browser