Author: rhuijben
Date: Thu Jun 9 09:27:09 2011
New Revision: 1133740
URL: http://svn.apache.org/viewvc?rev=1133740&view=rev
Log:
Don't mark file externals directly below an added directory as deleted.
* subversion/libsvn_wc/wc_db.c
(insert_base_node): Don't add a base-deleted node for a file external
where the parent shadows base.
* subversion/tests/cmdline/externals_tests.py
(file_external_update_without_commit): Remove XFail marking.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/externals_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=1133740&r1=1133739&r2=1133740&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jun 9 09:27:09 2011
@@ -889,7 +889,8 @@ insert_base_node(void *baton,
{
if (parent_relpath
&& ((pibb->status == svn_wc__db_status_normal)
- || (pibb->status == svn_wc__db_status_incomplete)))
+ || (pibb->status == svn_wc__db_status_incomplete))
+ && ! pibb->file_external)
{
SVN_ERR(extend_parent_delete(wcroot, local_relpath, scratch_pool));
}
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1133740&r1=1133739&r2=1133740&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Jun 9
09:27:09 2011
@@ -1792,7 +1792,6 @@ def file_external_in_sibling(sbox):
[], 'update')
@Issue(3823)
-@XFail()
def file_external_update_without_commit(sbox):
"update a file external without committing target"
