-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Log:
Fix issue #3544 -- svn update does not restore excluded files.
* subversion/libsvn_wc/update_editor.c
(complete_directory): Call `svn_wc__set_depth()' with the requested
depth and with `infinity' only when the depth value is `unknown'.
* subversion/libsvn_wc/entries.c
(take_from_entry): Set the default depth of the FILE (as
`infinity') had the file been excluded already.
* subversion/tests/cmdline/depth_tests.py
(test_list): Remove the XFail on `excluded_path_update_operation'.
Patch by: Kannan R <kann...@collab.net>
P.S : The change to update_editor.c here is the correct one to be
applied where the earlier patch [1] contains the partial one.
[1]-http://mail-archives.apache.org/mod_mbox/subversion-dev/201001.mbox/%3c4b44b91b.5020...@collab.net%3e
- --
Thanks & Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEVAwUBS0qqxXlTqcY7ytmIAQKmGAf9F+JpyAKqM2svHETk1QqT9FpjKFjxoLx6
Mq8Wiv7JymNg1f5rQYsed2E+wXPdIo2PkbhjOdG/HSO8JvujMe9ndYkFYfl2zBES
kbRmziE1O/91ecQak0pGRIEg/wG3r/T6i8WD7Jeh1vJIK9pVqPemlY69/Q+1yGEQ
BPY7Oiiinw1JCXIaH7luZFCMCkhA1s+2tgakbJVzizuRrY2ubVM8R1QJa0bVZOjy
jY2Fb/Qe2e1IALpL3nuwIp1TEQ/1031VfoOjDkfXS4+GYYkPklM7XBaN9sBnogNO
vxucXX9xHFaIrgQpMolzhMhkabd4YIjlxZ/5baIfb6Nfv98tSdB4sg==
=wBqA
-----END PGP SIGNATURE-----
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 896759)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -706,7 +706,9 @@
else
{
SVN_ERR(svn_wc__set_depth(eb->db, eb->target_abspath,
- svn_depth_infinity, pool));
+ eb->requested_depth == svn_depth_unknown
+ ? svn_depth_infinity
+ : eb->requested_depth, pool));
}
}
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 896759)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -177,6 +177,11 @@
{
dst->uuid = src->uuid;
}
+
+ /* We need to bring back the FILE as versioned */
+ if (dst->depth == svn_depth_exclude)
+ dst->depth = svn_depth_infinity;
+
}
static svn_error_t *
Index: subversion/tests/cmdline/depth_tests.py
===================================================================
--- subversion/tests/cmdline/depth_tests.py (revision 896759)
+++ subversion/tests/cmdline/depth_tests.py (working copy)
@@ -2537,7 +2537,7 @@
pull_in_tree_with_depth_option,
fold_tree_with_unversioned_modified_items,
depth_empty_update_on_file,
- XFail(excluded_path_update_operation),
+ excluded_path_update_operation,
excluded_path_misc_operation,
excluded_receive_remote_removal,
exclude_keeps_hidden_entries,
