• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29066 (tree)
Zeit2021-01-20 02:04:41
Autorstefankueng

Log Message

use the total number of conflicts (which includes tree conflict) to determine whether to retry the merge or start the conflict resolve method

Ändern Zusammenfassung

Diff

--- trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 29065)
+++ trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 29066)
@@ -1655,7 +1655,7 @@
16551655 if ((pWndButton == nullptr) || !pWndButton->IsWindowVisible())
16561656 return;
16571657
1658- if ((m_mergedRevisions.GetCount() == 0) || (m_nConflicts != 0) || (!m_url.IsEquivalentTo(m_url2)))
1658+ if ((m_mergedRevisions.GetCount() == 0) || (m_nTotalConflicts != 0) || (!m_url.IsEquivalentTo(m_url2)))
16591659 {
16601660 m_bCancelled = FALSE;
16611661 // svn_wc_notify_conflict_resolver_starting
Show on old repository browser