Author: philip
Date: Wed Oct 20 17:00:39 2010
New Revision: 1025645
URL: http://svn.apache.org/viewvc?rev=1025645&view=rev
Log:
Fix prop_test 3 XFAIL.
* subversion/libsvn_wc/wc_db.c
(db_read_pristine_props): Return props for incomplete directories.
* subversion/tests/cmdline/prop_tests.py
(update_props): Remove comment.
(test_list): Remove XFail.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/prop_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=1025645&r1=1025644&r2=1025645&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 20 17:00:39 2010
@@ -5082,8 +5082,10 @@ db_read_pristine_props(apr_hash_t **prop
presence = svn_sqlite__column_token(stmt, 1, presence_map);
}
- /* normal or copied: Fetch properties */
- if (presence == svn_wc__db_status_normal)
+ /* normal or copied: Fetch properties (during update we want
+ properties for incomplete as well) */
+ if (presence == svn_wc__db_status_normal
+ || presence == svn_wc__db_status_incomplete)
{
svn_error_t *err;
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1025645&r1=1025644&r2=1025645&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Wed Oct 20 17:00:39
2010
@@ -207,7 +207,6 @@ def update_props(sbox):
'-r', '2', wc_backup)
# This adds properties to nodes that have properties
- ### Currently FAILs because the pre-update properties on directories get lost
expected_status.tweak(wc_rev=3)
expected_disk.tweak('A/mu', props={'blue' : 'azul',
'blue2' : 'azul2'})
@@ -2366,7 +2365,7 @@ def propget_redirection(sbox):
test_list = [ None,
make_local_props,
commit_props,
- XFail(update_props),
+ update_props,
downdate_props,
remove_props,
update_conflict_props,
