[Cmake-commits] [cmake-commits] hoffman committed cmCTestUpdateHandler.cxx 1.41 1.42

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Sep 9 13:12:48 EDT 2008


Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv20394/Source/CTest

Modified Files:
	cmCTestUpdateHandler.cxx 
Log Message:
BUG: fix for bug 7292, svn parsing flagged errors or conflicts for switched or locked files


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -C 2 -d -r1.41 -r1.42
*** cmCTestUpdateHandler.cxx	31 Jan 2008 21:38:14 -0000	1.41
--- cmCTestUpdateHandler.cxx	9 Sep 2008 17:12:46 -0000	1.42
***************
*** 701,705 ****
        char mod = upChar[0];
        bool modifiedOrConflict = false;
!       if ( mod == 'X')
          {
          continue;
--- 701,705 ----
        char mod = upChar[0];
        bool modifiedOrConflict = false;
!       if ( mod == 'X' || mod == 'S' || mod == 'L')
          {
          continue;



More information about the Cmake-commits mailing list