diff options
| author | Brad King <brad.king@kitware.com> | 2011-10-24 21:02:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-10-24 21:03:34 (GMT) |
| commit | 74eb86c4a33140f71d9d248bb26ba0ff92fa0989 (patch) | |
| tree | 674acd6922ec76ca261042564fbc2e22edc0d98a | |
| parent | 89742d73cc684a78586fad2497048d9329c1160e (diff) | |
| download | CMake-74eb86c4a33140f71d9d248bb26ba0ff92fa0989.zip CMake-74eb86c4a33140f71d9d248bb26ba0ff92fa0989.tar.gz CMake-74eb86c4a33140f71d9d248bb26ba0ff92fa0989.tar.bz2 | |
Fix CTest.UpdateSVN with Subversion 1.7 (#12535)
The test adds a subdirectory with
svn add subdir
svn add ... subdir/foo.txt subdir/bar.txt
Subversion 1.7 fails on the second command with
svn: warning: W150002: '.../subdir/foo.txt' is already under version control
svn: warning: W150002: '.../subdir/bar.txt' is already under version control
svn: E200009: Could not add all targets because some targets don't exist
because it considers adding an already-versioned file to be an error.
Avoid the problem by using
svn add --depth=empty subdir
to add the subdirectory without the files it contains.
| -rw-r--r-- | Tests/CTestUpdateSVN.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in index 97b2a07..e18dfc9 100644 --- a/Tests/CTestUpdateSVN.cmake.in +++ b/Tests/CTestUpdateSVN.cmake.in @@ -63,7 +63,7 @@ update_content(user-source files_added files_removed dirs_added) if(dirs_added) run_child( WORKING_DIRECTORY ${TOP}/user-source - COMMAND ${SVNCMD} add ${dirs_added} + COMMAND ${SVNCMD} add --depth=empty ${dirs_added} ) endif(dirs_added) run_child( |