You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/04/22 18:05:08 UTC
svn commit: r1589188 - in /subversion/trunk/subversion: libsvn_wc/wc_db.c
tests/cmdline/copy_tests.py
Author: rhuijben
Date: Tue Apr 22 16:05:07 2014
New Revision: 1589188
URL: http://svn.apache.org/r1589188
Log:
Following up on r1589184, extend fix to also handle the excluded states.
* subversion/libsvn_wc/wc_db.c
(cross_db_copy): Don't retrieve pristing properties on excluded nodes.
* subversion/tests/cmdline/copy_tests.py
(ext_wc_copy_deleted): Extend test.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1589188&r1=1589187&r2=1589188&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Apr 22 16:05:07 2014
@@ -3844,7 +3844,9 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
src_wcroot, src_relpath, scratch_pool, scratch_pool));
- if (dst_status != svn_wc__db_status_not_present)
+ if (dst_status != svn_wc__db_status_not_present
+ && dst_status != svn_wc__db_status_excluded
+ && dst_status != svn_wc__db_status_server_excluded)
{
SVN_ERR(db_read_pristine_props(&props, src_wcroot, src_relpath, FALSE,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1589188&r1=1589187&r2=1589188&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Tue Apr 22 16:05:07 2014
@@ -5826,6 +5826,10 @@ def ext_wc_copy_deleted(sbox):
sbox.simple_commit()
svntest.actions.run_and_verify_svn(None, None, [],
+ 'up', '--set-depth', 'exclude',
+ sbox.ospath('A/D'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
'co', sbox.repo_url, wc2_dir, '-r', 1)
svntest.actions.run_and_verify_svn(None, None, [],