Hi,
There has been reports about commits (and merge?) failing with "You have to
update your working copy first" but without the subsequent offer to update.
Today I stumbled on one such case. I traced it
to CommitCommand::IsOutOfDate not checking for error 155011
(SVN_ERR_WC_NOT_UP_TO_DATE).
Is there a particular reason not to include this in "IsOutOfDate"?
I'm suggesting a simple patch:
[[[
Index: src/TortoiseProc/Commands/CommitCommand.cpp
===================================================================
--- src/TortoiseProc/Commands/CommitCommand.cpp (revision 29480)
+++ src/TortoiseProc/Commands/CommitCommand.cpp (working copy)
@@ -62,6 +62,7 @@
const apr_status_t errorStatus = pErr->apr_err;
if ((errorStatus == SVN_ERR_FS_TXN_OUT_OF_DATE) ||
(errorStatus == SVN_ERR_RA_OUT_OF_DATE) ||
+ (errorStatus == SVN_ERR_WC_NOT_UP_TO_DATE) ||
(errorStatus == SVN_ERR_FS_CONFLICT))
{
return true;
]]]
(And yes, I've got commit bits and can do this myself, but on the principle
of knowing what I don't know, I'm asking before committing something
stupid).
/Daniel
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn-dev/7c66d4ee-0957-41d5-bb93-47c1661a1f31n%40googlegroups.com.
