Author: philip
Date: Mon Jul 12 14:11:52 2010
New Revision: 963286
URL: http://svn.apache.org/viewvc?rev=963286&view=rev
Log:
* subversion/libsvn_wc/copy.c
(copy_versioned_dir): Handle deleted directories in added tree.
* subversion/tests/cmdline/copy_tests.py
(move_dir_containing_move): Extend test to include a moved subdir.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=963286&r1=963285&r2=963286&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 12 14:11:52 2010
@@ -2906,10 +2906,9 @@ get_info_for_copy(apr_int64_t *copyfrom_
else if (*status == svn_wc__db_status_deleted)
{
const char *work_del_abspath;
- const char *base_del_abspath;
- SVN_ERR(svn_wc__db_scan_deletion(&base_del_abspath, NULL,
- NULL, &work_del_abspath,
+ SVN_ERR(svn_wc__db_scan_deletion(NULL, NULL, NULL,
+ &work_del_abspath,
db, local_abspath,
scratch_pool, scratch_pool));
if (work_del_abspath)
