From 38649106815e28ecbe3f35074cf3642104aeaa0e Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 9 Sep 2008 13:12:46 -0400 Subject: BUG: fix for bug 7292, svn parsing flagged errors or conflicts for switched or locked files --- Source/CTest/cmCTestUpdateHandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index c438f62..0e7a6a4 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -700,7 +700,7 @@ int cmCTestUpdateHandler::ProcessHandler() std::string upFile = file_update_line.match(2); char mod = upChar[0]; bool modifiedOrConflict = false; - if ( mod == 'X') + if ( mod == 'X' || mod == 'S' || mod == 'L') { continue; } -- cgit v0.12