| Revision | 29509 (tree) |
|---|---|
| Zeit | 2022-12-23 18:04:44 |
| Autor | stefankueng |
clear the error contacting the server to avoid an abort on exit
trunk/src/SVN/SVNConflictInfo.cpp (diff)| @@ -535,7 +535,12 @@ | ||
| 535 | 535 | SVNTRACE( |
| 536 | 536 | m_err = svn_client_conflict_tree_get_details(m_conflict, m_pCtx, m_infoPool), |
| 537 | 537 | svnPath); |
| 538 | - | |
| 538 | + if (m_err) | |
| 539 | + { | |
| 540 | + // if the server is not reachable, auto resolving won't work but | |
| 541 | + // the user might still want to resolve manually | |
| 542 | + ClearSVNError(); | |
| 543 | + } | |
| 539 | 544 | ClearCAPIAuthCacheOnError(); |
| 540 | 545 | |
| 541 | 546 | if (m_treeConflicted) |
TortoiseSVN