• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29482 (tree)
Time2022-11-23 06:11:19
Authordanielsahlberg

Log Message

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.

https://groups.google.com/g/tortoisesvn-dev/c/HYdgsG0vhCY

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/Commands/CommitCommand.cpp (revision 29481)
+++ trunk/src/TortoiseProc/Commands/CommitCommand.cpp (revision 29482)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2007-2014, 2018, 2021 - TortoiseSVN
3+// Copyright (C) 2007-2014, 2018, 2021-2022 - 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
@@ -62,6 +62,7 @@
6262 const apr_status_t errorStatus = pErr->apr_err;
6363 if ((errorStatus == SVN_ERR_FS_TXN_OUT_OF_DATE) ||
6464 (errorStatus == SVN_ERR_RA_OUT_OF_DATE) ||
65+ (errorStatus == SVN_ERR_WC_NOT_UP_TO_DATE) ||
6566 (errorStatus == SVN_ERR_FS_CONFLICT))
6667 {
6768 return true;
Show on old repository browser