diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-10-31 14:31:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-10-31 14:31:05 (GMT) |
| commit | 3020a554ba4bff0477aa9422de7009ae5e9035e0 (patch) | |
| tree | 7c3a606d8a97acc863e4ca72b06dd85f3a30123f | |
| parent | 7ce0e4c576e1c9da0d35c323924d44a44bdc2fab (diff) | |
| download | CMake-3020a554ba4bff0477aa9422de7009ae5e9035e0.zip CMake-3020a554ba4bff0477aa9422de7009ae5e9035e0.tar.gz CMake-3020a554ba4bff0477aa9422de7009ae5e9035e0.tar.bz2 | |
ENH: Report when having conflicts
| -rw-r--r-- | Source/cmCTest.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 331fb22..64af104 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -704,6 +704,10 @@ int cmCTest::UpdateDirectory() { comment1 = "Locally modified file\n"; } + if ( mod == 'C' ) + { + comment1 = "Conflict while updating\n"; + } std::string path = cmSystemTools::GetFilenamePath(file); std::string fname = cmSystemTools::GetFilenameName(file); if ( path != current_path ) |