| Revision | 29482 (tree) |
|---|---|
| Zeit | 2022-11-23 06:11:19 |
| Autor |  danielsahlberg |
Fix a case where Commit would complain about the WC needs update, but without subsequent offer to update.
When there is a tree conflict (on a file?), Subversion returns SVN_ERR_WC_NOT_UP_TO_DATE. Add this to the list of error codes checked to figure out if the WC is out of date.
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // TortoiseSVN - a Windows shell extension for easy version control |
| 2 | 2 | |
| 3 | -// Copyright (C) 2007-2014, 2018, 2021 - TortoiseSVN | |
| 3 | +// Copyright (C) 2007-2014, 2018, 2021-2022 - TortoiseSVN | |
| 4 | 4 | |
| 5 | 5 | // This program is free software; you can redistribute it and/or |
| 6 | 6 | // modify it under the terms of the GNU General Public License |
| @@ -62,6 +62,7 @@ | ||
| 62 | 62 | const apr_status_t errorStatus = pErr->apr_err; |
| 63 | 63 | if ((errorStatus == SVN_ERR_FS_TXN_OUT_OF_DATE) || |
| 64 | 64 | (errorStatus == SVN_ERR_RA_OUT_OF_DATE) || |
| 65 | + (errorStatus == SVN_ERR_WC_NOT_UP_TO_DATE) || | |
| 65 | 66 | (errorStatus == SVN_ERR_FS_CONFLICT)) |
| 66 | 67 | { |
| 67 | 68 | return true; |
TortoiseSVN
trunk/src/TortoiseProc/Commands/CommitCommand.cpp