diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-09 17:12:46 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-09 17:12:46 (GMT) |
| commit | 38649106815e28ecbe3f35074cf3642104aeaa0e (patch) | |
| tree | fa88405d11fa6f6ab0e75e0e398c584ea2cc2f44 /Source/CTest/cmCTestUpdateHandler.cxx | |
| parent | 364ac7e38613829b7e39cb7f80229f9734fa7a57 (diff) | |
| download | CMake-38649106815e28ecbe3f35074cf3642104aeaa0e.zip CMake-38649106815e28ecbe3f35074cf3642104aeaa0e.tar.gz CMake-38649106815e28ecbe3f35074cf3642104aeaa0e.tar.bz2 | |
BUG: fix for bug 7292, svn parsing flagged errors or conflicts for switched or locked files
Diffstat (limited to 'Source/CTest/cmCTestUpdateHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |