[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix #3544 - svn update does not restore excluded files

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 11 Jan 2010 11:59:07 +0000

Kannan <kannanr_at_collab.net> writes:

> 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;
> +

take_from_entry is about copying from SRC to DST but here you are not
copying SRC. Should that be src->depth instead of svn_depth_infinity?
If svn_depth_infinity is correct then perhaps this bit of code should
be moved to the call site.

> }
>
> 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,

That test contains comments about the XFail that need to be updated/removed.

> excluded_path_misc_operation,
> excluded_receive_remote_removal,
> exclude_keeps_hidden_entries,
>

-- 
Philip
Received on 2010-01-11 12:59:45 CET

This is an archived mail posted to the Subversion Dev mailing list.