• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28840 (tree)
Zeit2020-04-09 02:57:05
Autorstefankueng

Log Message

Set the closeonend flag for the merge command.

Ändern Zusammenfassung

Diff

--- trunk/src/TortoiseProc/Commands/MergeCommand.cpp (revision 28839)
+++ trunk/src/TortoiseProc/Commands/MergeCommand.cpp (revision 28840)
@@ -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) 2007-2014 - TortoiseSVN
3+// Copyright (C) 2007-2014, 2020 - 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
@@ -58,6 +58,7 @@
5858 {
5959 CSVNProgressDlg progDlg;
6060 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Merge);
61+ progDlg.SetAutoClose(parser);
6162 int options = wizard.m_bIgnoreAncestry ? ProgOptIgnoreAncestry : 0;
6263 options |= wizard.m_bRecordOnly ? ProgOptRecordOnly : 0;
6364 options |= wizard.m_bForce ? ProgOptForce : 0;
Show on old repository browser