kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Report when having conflicts

Browse Source
This commit is contained in:
Andy Cedilnik 2003-10-31 09:31:05 -05:00
parent 7ce0e4c576
commit 3020a554ba
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmCTest.cxx
View File

@ -704,6 +704,10 @@ int cmCTest::UpdateDirectory()
{ {
comment1 = "Locally modified file\n"; comment1 = "Locally modified file\n";
} }
if ( mod == 'C' )
{
comment1 = "Conflict while updating\n";
}
std::string path = cmSystemTools::GetFilenamePath(file); std::string path = cmSystemTools::GetFilenamePath(file);
std::string fname = cmSystemTools::GetFilenameName(file); std::string fname = cmSystemTools::GetFilenameName(file);
if ( path != current_path ) if ( path != current_path )