| Revision | 29066 (tree) |
|---|---|
| Zeit | 2021-01-20 02:04:41 |
| Autor | stefankueng |
use the total number of conflicts (which includes tree conflict) to determine whether to retry the merge or start the conflict resolve method
trunk/src/TortoiseProc/SVNProgressDlg.cpp (diff)| @@ -1655,7 +1655,7 @@ | ||
| 1655 | 1655 | if ((pWndButton == nullptr) || !pWndButton->IsWindowVisible()) |
| 1656 | 1656 | return; |
| 1657 | 1657 | |
| 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))) | |
| 1659 | 1659 | { |
| 1660 | 1660 | m_bCancelled = FALSE; |
| 1661 | 1661 | // svn_wc_notify_conflict_resolver_starting |
TortoiseSVN