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

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.
This commit is contained in:
Brad King 2011-10-24 17:02:22 -04:00
parent 89742d73cc
commit 74eb86c4a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CTestUpdateSVN.cmake.in
View File

@ -63,7 +63,7 @@ update_content(user-source files_added files_removed dirs_added)
if(dirs_added) if(dirs_added)
run_child( run_child(
WORKING_DIRECTORY ${TOP}/user-source WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${SVNCMD} add ${dirs_added} COMMAND ${SVNCMD} add --depth=empty ${dirs_added}
) )
endif(dirs_added) endif(dirs_added)
run_child( run_child(