BUG: fix for bug 7292, svn parsing flagged errors or conflicts for switched or locked files
This commit is contained in:
parent
364ac7e386
commit
3864910681
@ -700,7 +700,7 @@ int cmCTestUpdateHandler::ProcessHandler()
|
|||||||
std::string upFile = file_update_line.match(2);
|
std::string upFile = file_update_line.match(2);
|
||||||
char mod = upChar[0];
|
char mod = upChar[0];
|
||||||
bool modifiedOrConflict = false;
|
bool modifiedOrConflict = false;
|
||||||
if ( mod == 'X')
|
if ( mod == 'X' || mod == 'S' || mod == 'L')
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user