This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 9d6fbcb5a3940f2d2125ebadb73ac2793a5f3bfc (commit)
via 74eb86c4a33140f71d9d248bb26ba0ff92fa0989 (commit)
from 8120129694f6290c34a4017704c5d0a358884c9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d6fbcb5a3940f2d2125ebadb73ac2793a5f3bfc
commit 9d6fbcb5a3940f2d2125ebadb73ac2793a5f3bfc
Merge: 8120129 74eb86c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 24 17:08:02 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 24 17:08:02 2011 -0400
Merge topic 'test-update-svn-1.7-issue-12535' into next
74eb86c Fix CTest.UpdateSVN with Subversion 1.7 (#12535)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74eb86c4a33140f71d9d248bb26ba0ff92fa0989
commit 74eb86c4a33140f71d9d248bb26ba0ff92fa0989
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 24 17:02:22 2011 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 24 17:03:34 2011 -0400
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.
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(
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestUpdateSVN.cmake.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
